initgroups_dyn: Always look up MAGIC_NONLOCAL_GROUPNAME

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/nonlocal-group.c b/nonlocal-group.c
index b7679ebd575720d658b994c898aa9c22debd69fb..97ce4a66f62324fd64884f3630613aab6a923e75 100644 (file)
--- 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);
        }
                   "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;
            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)
     }
 
     if (!is_nonlocal)