Don’t reset errno to 0.

[nss_nonlocal.git] / nonlocal-group.c

diff --git a/nonlocal-group.c b/nonlocal-group.c
index 56caa4402a5c3176154a737827782ca633eeddc0..0dfdb98f75c125ab9927476b1c5eabb30139cb13 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();