Check that a nonlocal lookup by id returns the right id.

[nss_nonlocal.git] / nonlocal-group.c

diff --git a/nonlocal-group.c b/nonlocal-group.c
index 83e5d12e385bbe5f8a1a640ed2712f9ded310937..6c3173aae7ece201b744e8750d4a40b132afee76 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -126,6 +126,25 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
     return status;
 }
 
+enum nss_status
+check_nonlocal_group(const char *user, struct group *grp, int *errnop)
+{
+    enum nss_status status = NSS_STATUS_SUCCESS;
+    int old_errno = errno;
+    char *end;
+    unsigned long gid;
+
+    errno = 0;
+    gid = strtoul(grp->gr_name, &end, 10);
+    if (errno == 0 && *end == '\0' && (gid_t)gid == gid)
+       status = check_nonlocal_gid(user, gid, errnop);
+    errno = old_errno;
+    if (status != NSS_STATUS_SUCCESS)
+       return status;
+
+    return check_nonlocal_gid(user, grp->gr_gid, errnop);
+}
+
 enum nss_status
 get_local_group(const char *name, struct group *grp, char **buffer, int *errnop)
 {
@@ -280,7 +299,7 @@ _nss_nonlocal_getgrent_r(struct group *grp, char *buffer, size_t buflen,
            do
                status = DL_CALL_FCT(grent_fct.l, (grp, buffer, buflen, errnop));
            while (status == NSS_STATUS_SUCCESS &&
-                  check_nonlocal_gid("(unknown)", grp->gr_gid, &nonlocal_errno) != NSS_STATUS_SUCCESS);
+                  check_nonlocal_group("(unknown)", grp, &nonlocal_errno) != NSS_STATUS_SUCCESS);
        }
        if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
            return status;
@@ -334,7 +353,7 @@ _nss_nonlocal_getgrnam_r(const char *name, struct group *grp,
        return NSS_STATUS_NOTFOUND;
     }
 
-    return check_nonlocal_gid(name, grp->gr_gid, errnop);
+    return check_nonlocal_group(name, grp, errnop);
 }
 
 enum nss_status
@@ -372,7 +391,12 @@ _nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp,
     if (status != NSS_STATUS_SUCCESS)
        return status;
 
-    return check_nonlocal_gid(grp->gr_name, grp->gr_gid, errnop);
+    if (gid != grp->gr_gid) {
+       syslog(LOG_ERR, "nss_nonlocal: discarding gid %d from lookup for gid %d\n", grp->gr_gid, gid);
+       return NSS_STATUS_NOTFOUND;
+    }
+
+    return check_nonlocal_group(grp->gr_name, grp, errnop);
 }
 
 enum nss_status