GNU C Library master sources branch, master, updated. glibc-2.11-395-g49bd556

drepper@sourceware.org drepper@sourceware.org
Mon May 3 17:40:00 GMT 2010


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  49bd556d43f55d0bb6d76d57e846af85f0c986c9 (commit)
      from  8497559725cd067a60c4d6dbf34ff02b5be387d5 (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=49bd556d43f55d0bb6d76d57e846af85f0c986c9

commit 49bd556d43f55d0bb6d76d57e846af85f0c986c9
Author: Ulrich Drepper <drepper@redhat.com>
Date:   Mon May 3 10:40:30 2010 -0700

    One more bug in ldconfig -r handling.

diff --git a/ChangeLog b/ChangeLog
index 4005fc8..85ab183 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-03  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/ldconfig.c (parse_conf_include): Don't fall back to
+	directories named in config file outside the chroot.
+
 2010-02-02  Andreas Schwab  <schwab@redhat.com>
 
 	* sysdeps/generic/ldsodefs.h (struct rtld_global): Add
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index b9f1cc2..4b9c435 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1174,7 +1174,9 @@ parse_conf_include (const char *config_file, unsigned int lineno,
   if (do_chroot && opt_chroot)
     {
       char *canon = chroot_canon (opt_chroot, pattern);
-      result = glob64 (canon ?: pattern, 0, NULL, &gl);
+      if (canon == NULL)
+	return;
+      result = glob64 (canon, 0, NULL, &gl);
       free (canon);
     }
   else

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

Summary of changes:
 ChangeLog      |    5 +++++
 elf/ldconfig.c |    4 +++-
 2 files changed, 8 insertions(+), 1 deletions(-)


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



More information about the Glibc-cvs mailing list