Add the extra check also in innetgr

diff --git a/ChangeLog b/ChangeLog
index 9b2915e4029d353b45ba468987dca7b676f6ef4b..38149a6f36beec3b043424dc4bbb32cd6c23cb23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * inet/getnetgrent_r.c (internal_getnetgrent_r): Fix check for known
        netgroups to read.
+       (innetgr): Likewise.
 
 2011-07-05  Roland McGrath  <roland@hack.frob.com>
 

diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index b588897df1c9192ca5dff0a352e7981ed9f51bf1..91cdcce4681cd8210c5c34eefaf824d1557456da 100644 (file)
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -389,6 +389,11 @@ innetgr (const char *netgroup, const char *host, const char *user,
                           namep = namep->next)
                        if (strcmp (entry.val.group, namep->name) == 0)
                          break;
+                     if (namep == NULL)
+                       for (namep = entry.needed_groups; namep != NULL;
+                            namep = namep->next)
+                         if (strcmp (entry.val.group, namep->name) == 0)
+                           break;
                      if (namep == NULL
                          && strcmp (netgroup, entry.val.group) != 0)
                        {