57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
commit a8c871a8714b968b1a1e3e679919a2125fc968f3
|
|
Author: Andreas Schwab <schwab@suse.de>
|
|
Date: Thu Jun 16 12:44:29 2016 +0200
|
|
|
|
Return proper status from _nss_nis_initgroups_dyn (bug 20262)
|
|
|
|
(cherry picked from commit 73fb56a4d51fd4437e4cde6dd3c8077a610f88a8)
|
|
|
|
diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c
|
|
index ed5c26b..5845b6d 100644
|
|
--- a/nis/nss_nis/nis-initgroups.c
|
|
+++ b/nis/nss_nis/nis-initgroups.c
|
|
@@ -266,7 +266,7 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
|
|
|
|
tmpbuf = __alloca (buflen);
|
|
|
|
- do
|
|
+ while (1)
|
|
{
|
|
while ((status =
|
|
internal_getgrent_r (&grpbuf, tmpbuf, buflen, errnop,
|
|
@@ -275,8 +275,11 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
|
|
tmpbuf = extend_alloca (tmpbuf, buflen, 2 * buflen);
|
|
|
|
if (status != NSS_STATUS_SUCCESS)
|
|
- goto done;
|
|
-
|
|
+ {
|
|
+ if (status == NSS_STATUS_NOTFOUND)
|
|
+ status = NSS_STATUS_SUCCESS;
|
|
+ goto done;
|
|
+ }
|
|
|
|
g = &grpbuf;
|
|
if (g->gr_gid != group)
|
|
@@ -304,7 +307,11 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
|
|
|
|
newgroups = realloc (groups, newsize * sizeof (*groups));
|
|
if (newgroups == NULL)
|
|
- goto done;
|
|
+ {
|
|
+ status = NSS_STATUS_TRYAGAIN;
|
|
+ *errnop = errno;
|
|
+ goto done;
|
|
+ }
|
|
*groupsp = groups = newgroups;
|
|
*size = newsize;
|
|
}
|
|
@@ -316,7 +323,6 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start,
|
|
}
|
|
}
|
|
}
|
|
- while (status == NSS_STATUS_SUCCESS);
|
|
|
|
done:
|
|
while (intern.start != NULL)
|