diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-10-04 08:56:18 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-10-04 08:56:18 +0000 |
| commit | 85148842d401edf64f9edee7e5819a947c289ed2 (patch) | |
| tree | 42f228e998070f60c3bdb2018c9921b221a6851b /nscd/nscd_initgroups.c | |
| parent | 6d96590587deec027c04fe576f11cff0f445eb32 (diff) | |
| download | glibc-85148842d401edf64f9edee7e5819a947c289ed2.tar.gz glibc-85148842d401edf64f9edee7e5819a947c289ed2.tar.xz glibc-85148842d401edf64f9edee7e5819a947c289ed2.zip | |
Updated to fedora-glibc-20041004T0747 cvs/fedora-glibc-2_3_3-64
Diffstat (limited to 'nscd/nscd_initgroups.c')
| -rw-r--r-- | nscd/nscd_initgroups.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/nscd/nscd_initgroups.c b/nscd/nscd_initgroups.c index d6cb00000e..ce44f654d7 100644 --- a/nscd/nscd_initgroups.c +++ b/nscd/nscd_initgroups.c @@ -81,8 +81,11 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, sock = __nscd_open_socket (user, userlen, INITGROUPS, &initgr_resp_mem, sizeof (initgr_resp_mem)); if (sock == -1) - /* nscd not running or wrong version or hosts caching disabled. */ - __nss_not_use_nscd_group = 1; + { + /* nscd not running or wrong version or hosts caching disabled. */ + __nss_not_use_nscd_group = 1; + goto out; + } initgr_resp = &initgr_resp_mem; } @@ -128,8 +131,12 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, } } else - /* No group found yet. */ - retval = 0; + { + /* No group found yet. */ + retval = 0; + + assert (*size >= 1); + } /* Check whether GROUP is part of the mix. If not, add it. */ if (retval >= 0) |