Index: server/common/oursrc/nss_nonlocal/nonlocal-group.c
===================================================================
--- server/common/oursrc/nss_nonlocal/nonlocal-group.c	(revision 750)
+++ server/common/oursrc/nss_nonlocal/nonlocal-group.c	(revision 782)
@@ -42,7 +42,15 @@
 #include "nonlocal.h"
 
-#define MAGIC_LOCAL_GR_BUFLEN (sysconf(_SC_GETGR_R_SIZE_MAX) + 7)
 #define MAGIC_NONLOCAL_GROUPNAME "nss-nonlocal-users"
 #define MAGIC_LOCAL_GROUPNAME "nss-local-users"
+
+
+enum nss_status
+_nss_nonlocal_getgrnam_r(const char *name, struct group *grp,
+			 char *buffer, size_t buflen, int *errnop);
+
+enum nss_status
+_nss_nonlocal_getgrgid_r(gid_t gid, struct group *grp,
+			 char *buffer, size_t buflen, int *errnop);
 
 
@@ -61,10 +69,18 @@
 check_nonlocal_gid(const char *user, gid_t gid, int *errnop)
 {
-    enum nss_status status = NSS_STATUS_SUCCESS;
+    static const char *fct_name = "getgrgid_r";
+    static service_user *startp = NULL;
+    static void *fct_start = NULL;
+    enum nss_status status;
+    service_user *nip;
+    union {
+	enum nss_status (*l)(gid_t gid, struct group *grp,
+			     char *buffer, size_t buflen, int *errnop);
+	void *ptr;
+    } fct;
     struct group gbuf;
-    struct group *gbufp = &gbuf;
-    int ret;
     int old_errno = errno;
-    int buflen = MAGIC_LOCAL_GR_BUFLEN;
+
+    int buflen = sysconf(_SC_GETGR_R_SIZE_MAX);
     char *buf = malloc(buflen);
     if (buf == NULL) {
@@ -73,15 +89,29 @@
 	return NSS_STATUS_TRYAGAIN;
     }
-    errno = 0;
-    ret = getgrgid_r(gid, gbufp, buf, buflen, &gbufp);
-    if (ret != 0) {
-	*errnop = old_errno;
-	status = NSS_STATUS_TRYAGAIN;
-    } else if (gbufp != NULL) {
+
+    if (fct_start == NULL &&
+	__nss_group_lookup(&startp, fct_name, &fct_start) != 0) {
+	free(buf);
+	return NSS_STATUS_UNAVAIL;
+    }
+    nip = startp;
+    fct.ptr = fct_start;
+    do {
+	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;
+    } while (__nss_next(&nip, fct_name, &fct.ptr, status, 0) == 0);
+
+    if (status == NSS_STATUS_SUCCESS) {
 	syslog(LOG_WARNING, "nss_nonlocal: removing local group %u (%s) from non-local user %s\n", gbuf.gr_gid, gbuf.gr_name, user);
 	status = NSS_STATUS_NOTFOUND;
-    }
+    } else if (status != NSS_STATUS_TRYAGAIN) {
+	status = NSS_STATUS_SUCCESS;
+    }
+
     free(buf);
-    errno = old_errno;
     return status;
 }
@@ -90,10 +120,19 @@
 get_local_group(const char *name, struct group *grp, char *buffer, size_t buflen, int *errnop)
 {
-    enum nss_status status = NSS_STATUS_NOTFOUND;
+    static const char *fct_name = "getgrnam_r";
+    static service_user *startp = NULL;
+    static void *fct_start = NULL;
+    enum nss_status status;
+    service_user *nip;
+    union {
+	enum nss_status (*l)(const char *name, struct group *grp,
+			     char *buffer, size_t buflen, int *errnop);
+	void *ptr;
+    } fct;
     struct group gbuf;
-    struct group *gbufp = &gbuf;
-    int ret, n;
+    int n;
     int old_errno = errno;
-    int len = MAGIC_LOCAL_GR_BUFLEN;
+
+    int len = sysconf(_SC_GETGR_R_SIZE_MAX);
     char *buf = malloc(len);
     if (buf == NULL) {
@@ -102,46 +141,57 @@
 	return NSS_STATUS_TRYAGAIN;
     }
-    errno = 0;
-    ret = getgrnam_r(name, gbufp, buf, len, &gbufp);
-    if (ret != 0) {
-	*errnop = old_errno;
+
+    if (fct_start == NULL &&
+	__nss_group_lookup(&startp, fct_name, &fct_start) != 0) {
+	free(buf);
+	return NSS_STATUS_UNAVAIL;
+    }
+    nip = startp;
+    fct.ptr = fct_start;
+    do {
+	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;
+    } 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;
-    } else if (gbufp != NULL) {
-	status = NSS_STATUS_SUCCESS;
-
-	n = snprintf(buffer, buflen, "%s", gbufp->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", gbufp->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 = gbufp->gr_gid;
-
-	if (buflen < sizeof(void *)) {
-	    *errnop = ERANGE;
-	    status = NSS_STATUS_TRYAGAIN;
-	    goto get_local_group_done;
-	}
-	*(void **)buffer = NULL;
-	buffer += sizeof(void *);
-	buflen -= sizeof(void *);
-    }
+	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;
+    }
+    *(void **)buffer = NULL;
+    buffer += sizeof(void *);
+    buflen -= sizeof(void *);
+
  get_local_group_done:
     free(buf);
-    errno = old_errno;
     return status;
 }
@@ -226,6 +276,5 @@
 
     char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
-    if (buflen == MAGIC_LOCAL_GR_BUFLEN ||
-	(nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0'))
+    if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
 	return NSS_STATUS_UNAVAIL;
 
@@ -272,6 +321,5 @@
 
     char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
-    if (buflen == MAGIC_LOCAL_GR_BUFLEN ||
-	(nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0'))
+    if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
 	return NSS_STATUS_UNAVAIL;
 
@@ -311,6 +359,5 @@
 
     char *nonlocal_ignore = getenv(NONLOCAL_IGNORE_ENV);
-    if (buflen == MAGIC_LOCAL_GR_BUFLEN ||
-	(nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0'))
+    if (nonlocal_ignore != NULL && nonlocal_ignore[0] != '\0')
 	return NSS_STATUS_UNAVAIL;
 
@@ -359,8 +406,8 @@
     /* Check that the user is a nonlocal user before adding any groups. */
     status = check_nonlocal_user(user, errnop);
-    if (status == NSS_STATUS_NOTFOUND)
+    if (status == NSS_STATUS_TRYAGAIN)
+	return status;
+    else if (status != NSS_STATUS_SUCCESS)
 	is_local = 1;
-    else if (status != NSS_STATUS_SUCCESS)
-	return status;
 
     int old_errno = errno;
@@ -375,12 +422,14 @@
     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);
 
@@ -397,13 +446,14 @@
  	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);
+	    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);
     }
@@ -437,6 +487,4 @@
     }
 
-    errno = old_errno;
-
     if (is_local)
 	return NSS_STATUS_SUCCESS;
@@ -481,5 +529,5 @@
 	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;