Merge branch 'master' of ssh://sourceware.org/git/glibc

diff --git a/ChangeLog b/ChangeLog
index 63887b79135572ea782244d6c33bda69699654a8..38149a6f36beec3b043424dc4bbb32cd6c23cb23 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2011-07-06  Ulrich Drepper  <drepper@gmail.com>
+
+       * 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>
+
+       * config.make.in (install_root): Default to $(DESTDIR).
+
+2011-07-05  Ulrich Drepper  <drepper@gmail.com>
+
+       * nscd/nscd_getserv_r.c (nscd_getserv_r): Add cast to avoid warning.
+
 2011-07-02  Roland McGrath  <roland@hack.frob.com>
 
        * Makerules ($(common-objpfx)format.lds): Fail if result is empty.

diff --git a/config.make.in b/config.make.in
index 6e876ebecea563216183686fcc3e6ab7aa762140..b73b21e09bdd2e040c1922bd6e23d6a74cf33843 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -5,7 +5,7 @@ version = @VERSION@
 release = @RELEASE@
 
 # Installation prefixes.
-install_root =
+install_root = $(DESTDIR)
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@

diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 42045a201d70641e5fde703376552e79a12c03c3..91cdcce4681cd8210c5c34eefaf824d1557456da 100644 (file)
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -279,6 +279,11 @@ internal_getnetgrent_r (char **hostp, char **userp, char **domainp,
               namep = namep->next)
            if (strcmp (datap->val.group, namep->name) == 0)
              break;
+         if (namep == NULL)
+           for (namep = datap->needed_groups; namep != NULL;
+                namep = namep->next)
+             if (strcmp (datap->val.group, namep->name) == 0)
+               break
          if (namep != NULL)
            /* Really ignore.  */
            continue;
@@ -384,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)
                        {

diff --git a/nscd/nscd_getserv_r.c b/nscd/nscd_getserv_r.c
index f9ef0565d8575122d8dbb0c55cd21d03f5033d40..3b7dc4b620da0a7e5178b269a1a00e215e491e3f 100644 (file)
--- a/nscd/nscd_getserv_r.c
+++ b/nscd/nscd_getserv_r.c
@@ -374,7 +374,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
       if (retval != -1)
        {
          if (!alloca_aliases_len)
-           free (aliases_len);
+           free ((void *) aliases_len);
          goto retry;
        }
     }