Autoheaderfiscate.

[nss_nonlocal.git] / nonlocal-group.c

diff --git a/nonlocal-group.c b/nonlocal-group.c
index 56caa4402a5c3176154a737827782ca633eeddc0..532dd73daf67db8e834362b201ef199d842c7941 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -72,7 +72,6 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
        errno = old_errno;
        return NSS_STATUS_TRYAGAIN;
     }
-    errno = 0;
     ret = getgrgid_r(gid, gbufp, buf, buflen, &gbufp);
     if (ret != 0) {
        *errnop = old_errno;
@@ -101,7 +100,6 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen
        errno = old_errno;
        return NSS_STATUS_TRYAGAIN;
     }
-    errno = 0;
     ret = getgrnam_r(name, gbufp, buf, len, &gbufp);
     if (ret != 0) {
        *errnop = old_errno;
@@ -223,6 +221,12 @@ _nss_nonlocal_getgrent_r(struct group *grp, char *buffer, size_t buflen,
                         int *errnop)
 {
     enum nss_status status;
+
+    char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
+    if (buflen == MAGIC_LOCAL_GR_BUFLEN ||
+       (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0'))
+       return NSS_STATUS_UNAVAIL;
+
     if (grent_nip == NULL) {
        status = _nss_nonlocal_setgrent(0);
        if (status != NSS_STATUS_SUCCESS)
@@ -264,7 +268,9 @@ _nss_nonlocal_getgrnam_r(const char *name, struct group *grp,
        void *ptr;
     } fct;
 
-    if (buflen == MAGIC_LOCAL_GR_BUFLEN)
+    char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
+    if (buflen == MAGIC_LOCAL_GR_BUFLEN ||
+       (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0'))
        return NSS_STATUS_UNAVAIL;
 
     nip = nss_group_nonlocal_database();
@@ -301,7 +307,9 @@ _nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp,
        void *ptr;
     } fct;
 
-    if (buflen == MAGIC_LOCAL_GR_BUFLEN)
+    char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
+    if (buflen == MAGIC_LOCAL_GR_BUFLEN ||
+       (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0'))
        return NSS_STATUS_UNAVAIL;
 
     nip = nss_group_nonlocal_database();
@@ -348,10 +356,10 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
 
     /* Check that the user is a nonlocal user before adding any groups. */
     status = check_nonlocal_user(user, errnop);
-    if (status == NSS_STATUS_NOTFOUND)
-       is_local = 1;
-    else if (status != NSS_STATUS_SUCCESS)
+    if (status == NSS_STATUS_TRYAGAIN)
        return status;
+    else if (status != NSS_STATUS_SUCCESS)
+       is_local = 1;
 
     int old_errno = errno;
 
@@ -364,14 +372,16 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
     }
     status = get_local_group(MAGIC_LOCAL_GROUPNAME,
                             &local_users_group, buffer, buflen, errnop);
-    if (status == NSS_STATUS_NOTFOUND) {
+    if (status == NSS_STATUS_SUCCESS) {
+       local_users_gid = local_users_group.gr_gid;
+    } else if (status == NSS_STATUS_TRYAGAIN) {
+       free(buffer);
+       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) {
-       return status;
-    } else
-       local_users_gid = local_users_group.gr_gid;
+    }
     free(buffer);
 
     if (is_local) {
@@ -386,15 +396,17 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
        }
        status = get_local_group(MAGIC_NONLOCAL_GROUPNAME,
                                 &nonlocal_users_group, buffer, buflen, errnop);
-       if (status == NSS_STATUS_NOTFOUND) {
+       if (status == NSS_STATUS_SUCCESS) {
+           gid = nonlocal_users_group.gr_gid;
+       } else if (status == NSS_STATUS_TRYAGAIN) {
+           free(buffer);
+           errno = old_errno;
+           return status;
+       } else {
            syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
                   MAGIC_NONLOCAL_GROUPNAME);
            gid = -1;
-       } else if (status != NSS_STATUS_SUCCESS) {
-           errno = old_errno;
-           return status;
-       } else
-           gid = nonlocal_users_group.gr_gid;
+       }
        free(buffer);
     }
 
@@ -470,7 +482,7 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
        status = check_nonlocal_gid(user, (*groupsp)[in], &nonlocal_errno);
        if (status == NSS_STATUS_SUCCESS) {
            (*groupsp)[out++] = (*groupsp)[in];
-       } else if (status != NSS_STATUS_NOTFOUND) {
+       } else if (status == NSS_STATUS_TRYAGAIN) {
            *start = out;
            *errnop = nonlocal_errno;
            return status;