Merge version 1.9.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/configure.ac b/configure.ac
index bcbe4859fe86663174590f25ba7750f94787e0ed..22227dcbff9de30645face60ced13f31caa9c6b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([nss_nonlocal], [1.8], [andersk@mit.edu])
+AC_INIT([nss_nonlocal], [1.9], [andersk@mit.edu])
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 

diff --git a/nonlocal-group.c b/nonlocal-group.c
index ba54ddcb47dd7dbb9831cee00732cad7d0267c60..3eb9fe9ba3c250c3388aa9cdc565a08ad3cc8b7f 100644 (file)
--- a/nonlocal-group.c
+++ b/nonlocal-group.c
@@ -97,12 +97,22 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getgrgid_r)
            status = NSS_STATUS_NOTFOUND;
        else
            status = DL_CALL_FCT(fct.l, (gid, &gbuf, 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) {
@@ -117,7 +127,7 @@ check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
 }
 
 enum nss_status
-get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen, int *errnop)
+get_local_group(const char *name, struct group *grp, char **buffer, int *errnop)
 {
     static const char *fct_name = "getgrnam_r";
     static service_user *startp = NULL;
@@ -129,13 +139,12 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen
                             char *buffer, size_t buflen, int *errnop);
        void *ptr;
     } fct;
-    struct group gbuf;
-    int n;
+    size_t buflen;
     int old_errno = errno;
 
-    int len = sysconf(_SC_GETGR_R_SIZE_MAX);
-    char *buf = malloc(len);
-    if (buf == NULL) {
+    buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+    *buffer = malloc(buflen);
+    if (*buffer == NULL) {
        *errnop = ENOMEM;
        errno = old_errno;
        return NSS_STATUS_TRYAGAIN;
@@ -143,56 +152,36 @@ get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen
 
     if (fct_start == NULL &&
        __nss_group_lookup(&startp, fct_name, &fct_start) != 0) {
-       free(buf);
+       free(*buffer);
+       *buffer = NULL;
        return NSS_STATUS_UNAVAIL;
     }
     nip = startp;
     fct.ptr = fct_start;
     do {
+    morebuf:
        if (fct.l == _nss_nonlocal_getgrnam_r)
            status = NSS_STATUS_NOTFOUND;
        else
-           status = DL_CALL_FCT(fct.l, (name, &gbuf, buf, buflen, errnop));
-       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE)
-           break;
+           status = DL_CALL_FCT(fct.l, (name, grp, *buffer, buflen, errnop));
+       if (status == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) {
+           free(*buffer);
+           buflen *= 2;
+           *buffer = malloc(buflen);
+           if (*buffer == 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)
-       goto get_local_group_done;
-
-    n = snprintf(buffer, buflen, "%s", gbuf.gr_name);
-    if (n < 0 || n >= buflen) {
-       *errnop = ERANGE;
-       status = NSS_STATUS_TRYAGAIN;
-       goto get_local_group_done;
-    }
-    grp->gr_name = buffer;
-    buffer += n;
-    buflen -= n;
-
-    n = snprintf(buffer, buflen, "%s", gbuf.gr_passwd);
-    if (n < 0 || n >= buflen) {
-       *errnop = ERANGE;
-       status = NSS_STATUS_TRYAGAIN;
-       goto get_local_group_done;
-    }
-    grp->gr_passwd = buffer;
-    buffer += n;
-    buflen -= n;
-
-    grp->gr_gid = gbuf.gr_gid;
-
-    if (buflen < sizeof(void *)) {
-       *errnop = ERANGE;
-       status = NSS_STATUS_TRYAGAIN;
-       goto get_local_group_done;
+    if (status != NSS_STATUS_SUCCESS) {
+       free(*buffer);
+       *buffer = NULL;
     }
-    *(void **)buffer = NULL;
-    buffer += sizeof(void *);
-    buflen -= sizeof(void *);
 
- get_local_group_done:
-    free(buf);
     return status;
 }
 
@@ -400,7 +389,6 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
     struct group local_users_group, nonlocal_users_group;
     gid_t local_users_gid, gid;
     int is_local = 0;
-    int buflen;
     char *buffer;
 
     /* Check that the user is a nonlocal user before adding any groups. */
@@ -412,50 +400,34 @@ _nss_nonlocal_initgroups_dyn(const char *user, gid_t group, long int *start,
 
     int old_errno = errno;
 
-    buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-    buffer = malloc(buflen);
-    if (buffer == NULL) {
-       *errnop = ENOMEM;
-       errno = old_errno;
-       return NSS_STATUS_TRYAGAIN;
-    }
     status = get_local_group(MAGIC_LOCAL_GROUPNAME,
-                            &local_users_group, buffer, buflen, errnop);
+                            &local_users_group, &buffer, errnop);
     if (status == NSS_STATUS_SUCCESS) {
        local_users_gid = local_users_group.gr_gid;
-    } else if (status == NSS_STATUS_TRYAGAIN) {
        free(buffer);
+    } else 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;
     }
-    free(buffer);
 
     if (is_local) {
        gid = local_users_gid;
     } else {
-       buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
-       buffer = malloc(buflen);
-       if (buffer == NULL) {
-           *errnop = ENOMEM;
-           errno = old_errno;
-           return NSS_STATUS_TRYAGAIN;
-       }
        status = get_local_group(MAGIC_NONLOCAL_GROUPNAME,
-                                &nonlocal_users_group, buffer, buflen, errnop);
+                                &nonlocal_users_group, &buffer, errnop);
        if (status == NSS_STATUS_SUCCESS) {
            gid = nonlocal_users_group.gr_gid;
-       } else if (status == NSS_STATUS_TRYAGAIN) {
            free(buffer);
+       } else if (status == NSS_STATUS_TRYAGAIN) {
            return status;
        } else {
            syslog(LOG_WARNING, "nss_nonlocal: Group %s does not exist locally!",
                   MAGIC_NONLOCAL_GROUPNAME);
            gid = -1;
        }
-       free(buffer);
     }
 
     if (gid != -1) {

diff --git a/nonlocal-passwd.c b/nonlocal-passwd.c
index 80708dc1f8d62ba4d6d270dc2cf2b5c48b3476c1..a5570df6040f7217b69ea4a849f97bbe1ca08b4a 100644 (file)
--- a/nonlocal-passwd.c
+++ b/nonlocal-passwd.c
@@ -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) {
@@ -146,12 +156,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)