Document nss-nonlocal-users and nss-local-users

[nss_nonlocal.git] / nonlocal-group.c

diff --git a/nonlocal-group.c b/nonlocal-group.c
index 63f7e46960e76df76ec6bc07f8b999a6c93e0f46..e93a3a25de8225cc584b4dbf9364f5a93e4b28cd 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -38,7 +38,16 @@
 #include "nsswitch-internal.h"
 #include "nonlocal.h"
 
+/*
+ * If the MAGIC_NONLOCAL_GROUPNAME local group exists, then nonlocal
+ * users will be automatically added to it.
+ */
 #define MAGIC_NONLOCAL_GROUPNAME "nss-nonlocal-users"
+
+/*
+ * If the MAGIC_LOCAL_GROUPNAME local group exists, then local users
+ * will be automatically added to it.
+ */
 #define MAGIC_LOCAL_GROUPNAME "nss-local-users"
 
 
@@ -325,52 +334,51 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
     const __typeof__(&_nss_nonlocal_initgroups_dyn) self = NULL;
 
     struct group local_users_group, nonlocal_users_group;
-    gid_t local_users_gid;
-    int is_local = 0;
+    bool is_nonlocal = true;
     char *buffer;
     int in, out, i;
 
     /* Check that the user is a nonlocal user before adding any groups. */
     status = check_nonlocal_user(user, errnop);
-    if (status == NSS_STATUS_TRYAGAIN)
-       return status;
-    else if (status != NSS_STATUS_SUCCESS)
-       is_local = 1;
-
-    status = get_local_group(MAGIC_LOCAL_GROUPNAME,
-                            &local_users_group, &buffer, errnop);
-    if (status == NSS_STATUS_SUCCESS) {
-       local_users_gid = local_users_group.gr_gid;
-       free(buffer);
-    } else if (status == NSS_STATUS_TRYAGAIN) {
+    if (status == NSS_STATUS_TRYAGAIN) {
        return status;
-    } else {
-       syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
-              MAGIC_LOCAL_GROUPNAME);
-       local_users_gid = -1;
-    }
+    } else if (status != NSS_STATUS_SUCCESS) {
+       is_nonlocal = false;
 
-    if (is_local) {
-       if (!add_group(local_users_gid, start, size, groupsp, limit, errnop,
-                      &status))
-           return status;
-    } else {
-       status = get_local_group(MAGIC_NONLOCAL_GROUPNAME,
-                                &nonlocal_users_group, &buffer, errnop);
+       status = get_local_group(MAGIC_LOCAL_GROUPNAME,
+                                &local_users_group, &buffer, errnop);
        if (status == NSS_STATUS_SUCCESS) {
            free(buffer);
-           if (!add_group(nonlocal_users_group.gr_gid, start, size, groupsp,
+           if (!add_group(local_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);
+           syslog(LOG_WARNING,
+                  "nss_nonlocal: Group %s does not exist locally!",
+                  MAGIC_LOCAL_GROUPNAME);
+       }
+    }
+
+    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) {
+       if (is_nonlocal)
+           return status;
+    } else {
+       syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
+              MAGIC_NONLOCAL_GROUPNAME);
     }
 
-    if (is_local)
+    if (!is_nonlocal)
        return NSS_STATUS_SUCCESS;
 
     in = out = *start;