GNU C Library master sources branch, master, updated. glibc-2.12-221-g6db52fb

[drepper at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  6db52fbb272979bdcd5d5dd7ab187e1893eda9e3 (commit)
      from  eaca75697fdc5c21195935eca2f0b149a75c0316 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6db52fbb272979bdcd5d5dd7ab187e1893eda9e3

commit 6db52fbb272979bdcd5d5dd7ab187e1893eda9e3
Author: Petr Baudis <pasky@suse.cz>
Date:   Mon Nov 22 12:47:57 2010 -0500

    Allow aux_cache_file open()ing to fail silently even in the chroot mode.
    
    The aux_cache fix of bug 11149 introduced a new bug - normally,
    ldconfig -r never cares if the auxiliary cache is not available and
    that is not a fatal problem, however this is not the case in case
    of ldconfig -r when executed as non-root. In that case, ldconfig -r
    fails hard unless var/cache/ldconfig/ exists within the chroot. This
    patch fixes that.
    
    Conflicts:
    
    	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index daf74dd..4f4b03c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-31  Petr Baudis  <pasky@suse.cz>
+
+	[BZ #11149]
+	* elf/ldconfig.c (main): Allow aux_cache_file open()ing to fail
+	silently even in the chroot mode.
+
 2010-11-22  Ulrich Drepper  <drepper@gmail.com>
 
 	* nis/nss_compat/compat-initgroups.c (internal_getgrent_r): Optimize
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index b4af31e..b82ca8e 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1359,14 +1359,9 @@ main (int argc, char **argv)
 
   const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
   if (opt_chroot)
-    {
-      aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
-      if (aux_cache_file == NULL)
-	error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
-	       _PATH_LDCONFIG_AUX_CACHE);
-    }
+    aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
 
-  if (! opt_ignore_aux_cache)
+  if (! opt_ignore_aux_cache && aux_cache_file)
     load_aux_cache (aux_cache_file);
   else
     init_aux_cache ();
@@ -1376,7 +1371,8 @@ main (int argc, char **argv)
   if (opt_build_cache)
     {
       save_cache (cache_file);
-      save_aux_cache (aux_cache_file);
+      if (aux_cache_file)
+        save_aux_cache (aux_cache_file);
     }
 
   return 0;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog      |    6 ++++++
 elf/ldconfig.c |   12 ++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources