From a4e1e15362c12ca5efa9821ddad372c8a07c93c8 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 26 Jun 2010 17:34:23 -0400 Subject: [PATCH] initgroups_dyn: Always look up MAGIC_NONLOCAL_GROUPNAME Signed-off-by: Anders Kaseorg --- nonlocal-group.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/nonlocal-group.c b/nonlocal-group.c index b7679eb..97ce4a6 100644 --- a/nonlocal-group.c +++ b/nonlocal-group.c @@ -350,20 +350,23 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start, "nss_nonlocal: Group %s does not exist locally!", MAGIC_LOCAL_GROUPNAME); } - } else { - status = get_local_group(MAGIC_NONLOCAL_GROUPNAME, - &nonlocal_users_group, &buffer, errnop); - if (status == NSS_STATUS_SUCCESS) { - free(buffer); + } + + status = get_local_group(MAGIC_NONLOCAL_GROUPNAME, + &nonlocal_users_group, &buffer, errnop); + if (status == NSS_STATUS_SUCCESS) { + free(buffer); + if (is_nonlocal) { if (!add_group(nonlocal_users_group.gr_gid, start, size, groupsp, limit, errnop, &status)) return status; - } else if (status == NSS_STATUS_TRYAGAIN) { - return status; - } else { - syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!", - MAGIC_NONLOCAL_GROUPNAME); } + } else if (status == NSS_STATUS_TRYAGAIN) { + if (is_nonlocal) + return status; + } else { + syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!", + MAGIC_NONLOCAL_GROUPNAME); } if (!is_nonlocal) -- 2.44.0