diff options
| author | Andreas Schwab <schwab@suse.de> | 2016-06-16 12:44:29 +0200 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-11-12 00:44:38 -0500 |
| commit | f7076e089854bbbce413dd9a832d3f39515d0d45 (patch) | |
| tree | da5abf581f6f8d2b0b9ebe8b002350949e5fbb56 | |
| parent | 3f97c0cafa1d661fe2ffa946c215f613beb32cd6 (diff) | |
| download | glibc-f7076e089854bbbce413dd9a832d3f39515d0d45.tar.gz glibc-f7076e089854bbbce413dd9a832d3f39515d0d45.tar.xz glibc-f7076e089854bbbce413dd9a832d3f39515d0d45.zip | |
Return proper status from _nss_nis_initgroups_dyn (bug 20262)
(cherry picked from commit 73fb56a4d51fd4437e4cde6dd3c8077a610f88a8) (cherry picked from commit 395b1b9cbfda75fcdef0a9654d7ef6bf8bf7db11)
| -rw-r--r-- | nis/nss_nis/nis-initgroups.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c index dec385cec7..0368667cf6 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) |