diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-12-20 09:29:29 +0100 |
| commit | a65dd355fb80a05215e15ae97649de52aec885e3 (patch) | |
| tree | 81701bb0c6b648630f2bf1729a85d7f5eb49e67b /nscd/initgrcache.c | |
| parent | 296a5732f94abe4d5699dc981e4ccfb950b48cee (diff) | |
| parent | b4578bab30f72cddd2cf38abfb39f9c8dc892249 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'nscd/initgrcache.c')
| -rw-r--r-- | nscd/initgrcache.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c index 462780e624..4580884ead 100644 --- a/nscd/initgrcache.c +++ b/nscd/initgrcache.c @@ -80,17 +80,16 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req, } static service_user *group_database; - service_user *nip = NULL; + service_user *nip; int no_more; - if (group_database != NULL) - { - nip = group_database; - no_more = 0; - } - else + if (group_database == NULL) no_more = __nss_database_lookup ("group", NULL, - "compat [NOTFOUND=return] files", &nip); + "compat [NOTFOUND=return] files", + &group_database); + else + no_more = 0; + nip = group_database; /* We always use sysconf even if NGROUPS_MAX is defined. That way, the limit can be raised in the kernel configuration without having to |