Update.

1998-07-07 16:28  Ulrich Drepper  <drepper@cygnus.com>

	* grp/initgroups.c: Handle directives from nsswitch.conf file.

diff --git a/ChangeLog b/ChangeLog
index 4d02e819375258616308fdd20115e39649045351..4ab9d7bd4859bdccabb1f05e027b4bab54c804d6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-07 16:28  Ulrich Drepper  <drepper@cygnus.com>
+
+       * grp/initgroups.c: Handle directives from nsswitch.conf file.
+
 1998-07-07  Ulrich Drepper  <drepper@cygnus.com>
 
        * sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Add

diff --git a/grp/initgroups.c b/grp/initgroups.c
index 454882e0af7f2f65ab369bf8f66e3ecf562ac9cb..d74d08ddd07f5312a4882e8add16719a01880b82 100644 (file)
--- a/grp/initgroups.c
+++ b/grp/initgroups.c
@@ -182,12 +182,24 @@ initgroups (user, group)
       fct = __nss_lookup_function (nip, "initgroups");
 
       if (fct == NULL)
-       status = compat_call (nip, user, group, &start, &size, groups,
-                             limit, &errno);
+       {
+         status = compat_call (nip, user, group, &start, &size, groups,
+                               limit, &errno);
+
+         if (nss_next_action (nip, NSS_STATUS_UNAVAIL) != NSS_ACTION_CONTINUE)
+           break;
+       }
       else
        status = _CALL_DL_FCT (fct, (user, group, &start, &size, groups, limit,
                                     &errno));
 
+      /* This is really only for debugging.  */
+      if (NSS_STATUS_TRYAGAIN > status || status > NSS_STATUS_RETURN)
+        __libc_fatal ("illegal status in " __FUNCTION__);
+
+      if (nss_next_action (nip, status) == NSS_ACTION_RETURN)
+        break;
+
       if (nip->next == NULL)
        no_more = -1;
       else