Add check_nonlocal_passwd and check_nonlocal_group helper functions.

[nss_nonlocal.git] / nonlocal-passwd.c

diff --git a/nonlocal-passwd.c b/nonlocal-passwd.c
index 80708dc1f8d62ba4d6d270dc2cf2b5c48b3476c1..ffd5375fe6e0125dda81369a880e4c5110090ddd 100644 (file)
--- a/nonlocal-passwd.c
+++ b/nonlocal-passwd.c
@@ -79,7 +79,7 @@ check_nonlocal_uid(const char *user, uid_t uid, int *errnop)
     struct passwd pwbuf;
     int old_errno = errno;
 
-    int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+    size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
     char *buf = malloc(buflen);
     if (buf == NULL) {
        *errnop = ENOMEM;
@@ -95,12 +95,22 @@ check_nonlocal_uid(const char *user, uid_t uid, int *errnop)
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getpwuid_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (uid, &pwbuf, buf, buflen, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(buf);
+           buflen *= 2;
+           buf = malloc(buflen);
+           if (buf == NULL) {
+               *errnop = ENOMEM;
+               errno = old_errno;
+               return NSS_STATUS_TRYAGAIN;
+           }
+           goto morebuf;
+       }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status == NSS_STATUS_SUCCESS) {
@@ -114,6 +124,12 @@ check_nonlocal_uid(const char *user, uid_t uid, int *errnop)
     return status;
 }
 
+enum nss_status
+check_nonlocal_passwd(const char *user, struct passwd *pwd, int *errnop)
+{
+    return check_nonlocal_uid(user, pwd->pw_uid, errnop);
+}
+
 enum nss_status
 check_nonlocal_user(const char *user, int *errnop)
 {
@@ -130,7 +146,7 @@ check_nonlocal_user(const char *user, int *errnop)
     struct passwd pwbuf;
     int old_errno = errno;
 
-    int buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
+    size_t buflen = sysconf(_SC_GETPW_R_SIZE_MAX);
     char *buf = malloc(buflen);
     if (buf == NULL) {
        *errnop = ENOMEM;
@@ -146,12 +162,22 @@ check_nonlocal_user(const char *user, int *errnop)
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getpwnam_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (user, &pwbuf, buf, buflen, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(buf);
+           buflen *= 2;
+           buf = malloc(buflen);
+           if (buf == NULL) {
+               *errnop = ENOMEM;
+               errno = old_errno;
+               return NSS_STATUS_TRYAGAIN;
+           }
+           goto morebuf;
+       }
     } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
 
     if (status == NSS_STATUS_SUCCESS)
@@ -259,7 +285,7 @@ _nss_nonlocal_getpwent_r(struct passwd *pwd, char *buffer, size_t buflen,
            do
                status = DL_CALL_FCT(pwent_fct.l, (pwd, buffer, buflen, errnop));
            while (status == NSS_STATUS_SUCCESS &&
-                  check_nonlocal_uid(pwd->pw_name, pwd->pw_uid, &nonlocal_errno) != NSS_STATUS_SUCCESS);
+                  check_nonlocal_passwd(pwd->pw_name, pwd, &nonlocal_errno) != NSS_STATUS_SUCCESS);
        }
        if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
            return status;
@@ -309,7 +335,12 @@ _nss_nonlocal_getpwnam_r(const char *name, struct passwd *pwd,
     if (status != NSS_STATUS_SUCCESS)
        return status;
 
-    status = check_nonlocal_uid(name, pwd->pw_uid, errnop);
+    if (strcmp(name, pwd->pw_name) != 0) {
+       syslog(LOG_ERR, "nss_nonlocal: discarding user %s from lookup for user %s\n", pwd->pw_name, name);
+       return NSS_STATUS_NOTFOUND;
+    }
+
+    status = check_nonlocal_passwd(name, pwd, errnop);
     if (status != NSS_STATUS_SUCCESS)
        return status;
 
@@ -355,7 +386,7 @@ _nss_nonlocal_getpwuid_r(uid_t uid, struct passwd *pwd,
     if (status != NSS_STATUS_SUCCESS)
        return status;
 
-    status = check_nonlocal_uid(pwd->pw_name, pwd->pw_uid, errnop);
+    status = check_nonlocal_passwd(pwd->pw_name, pwd, errnop);
     if (status != NSS_STATUS_SUCCESS)
        return status;