diff options
Diffstat (limited to 'nscd/nscd_initgroups.c')
| -rw-r--r-- | nscd/nscd_initgroups.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/nscd/nscd_initgroups.c b/nscd/nscd_initgroups.c index daddf2e164..2ea9e7f862 100644 --- a/nscd/nscd_initgroups.c +++ b/nscd/nscd_initgroups.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. @@ -75,7 +75,7 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, sizeof (initgr_resp_mem)); if (sock == -1) { - /* nscd not running or wrong version. */ + /* nscd not running or wrong version or hosts caching disabled. */ __nss_not_use_nscd_group = 1; goto out; } @@ -101,7 +101,7 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, (initgr_resp->ngrps + 1) * sizeof (gid_t)); if (newp == NULL) /* We cannot increase the buffer size. */ - goto out_close; + goto out; *groupsp = newp; *size = initgr_resp->ngrps + 1; @@ -125,13 +125,6 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, } else { - if (__builtin_expect (initgr_resp->found == -1, 0)) - { - /* The daemon does not cache this database. */ - __nss_not_use_nscd_group = 1; - goto out_close; - } - /* No group found yet. */ retval = 0; @@ -150,7 +143,6 @@ __nscd_getgrouplist (const char *user, gid_t group, long int *size, (*groupsp)[retval++] = group; } - out_close: if (sock != -1) close_not_cancel_no_status (sock); out: |