Attachment 178841 Details for Bug 263081 – Patch fixing group lookups for large groups

Patch fixing group lookups for large groups

autofs-biggroup.patch (text/plain), 1.97 KB, created by Ryan Thomas on 2007-08-29 12:01:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Thomas

Created: 2007-08-29 12:01:31 UTC

Size: 1.97 KB

patch

obsolete

>--- autofs-5.0.1/daemon/indirect.c.biggroup	2007-08-29 07:26:25.000000000 -0400
>+++ autofs-5.0.1/daemon/indirect.c	2007-08-29 07:27:11.000000000 -0400
>@@ -844,16 +844,27 @@
> 		goto cont;
> 	}
> 
>-	gr_tmp = malloc(tmplen + 1);
>-	if (!gr_tmp) {
>-		error(ap->logopt, "failed to malloc buffer for getgrgid_r");
>-		free(tsv->user);
>-		free(tsv->home);
>-		free(tsv);
>-		goto cont;
>-	}
>+	do {
>+	  status = ENOMEM;
>+
>+	  gr_tmp = malloc(tmplen + 1);
>+	  if (!gr_tmp) {
>+	    error(ap->logopt, "failed to malloc buffer for getgrgid_r");
>+	    free(tsv->user);
>+	    free(tsv->home);
>+	    free(tsv);
>+	    goto cont;
>+	  }
>+	  pgr = &gr;
>+	  status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
>+	  if (ppgr == NULL && !status)
>+	    status = ENOENT;
>+	  if (status == ERANGE) {
>+	    tmplen *= 2;
>+	    free(gr_tmp);
>+	  }
>+	} while (status == ERANGE);
> 
>-	status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
> 	if (status) {
> 		error(ap->logopt, "failed to get group info from getgrgid_r");
> 		free(tsv->user);
>--- autofs-5.0.1/daemon/direct.c.biggroup	2007-08-29 07:26:25.000000000 -0400
>+++ autofs-5.0.1/daemon/direct.c	2007-08-29 07:27:01.000000000 -0400
>@@ -1364,16 +1364,27 @@
> 		goto cont;
> 	}
> 
>-	gr_tmp = malloc(tmplen + 1);
>-	if (!gr_tmp) {
>-		error(ap->logopt, "failed to malloc buffer for getgrgid_r");
>-		free(tsv->user);
>-		free(tsv->home);
>-		free(tsv);
>-		goto cont;
>-	}
>+	do {
>+	  status = ENOMEM;
>+
>+	  gr_tmp = malloc(tmplen + 1);
>+	  if (!gr_tmp) {
>+	    error(ap->logopt, "failed to malloc buffer for getgrgid_r");
>+	    free(tsv->user);
>+	    free(tsv->home);
>+	    free(tsv);
>+	    goto cont;
>+	  }
>+	  pgr = &gr;
>+	  status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
>+	  if (ppgr == NULL && !status)
>+	    status = ENOENT;
>+	  if (status == ERANGE) {
>+	    tmplen *= 2;
>+	    free(gr_tmp);
>+	  }
>+	} while (status == ERANGE);
> 
>-	status = getgrgid_r(mt->gid, pgr, gr_tmp, tmplen, ppgr);
> 	if (status) {
> 		error(ap->logopt, "failed to get group info from getgrgid_r");
> 		free(tsv->user);

Actions: View

Attachments on bug 263081: 178841