From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 3 May 2010 17:40:30 +0000 (-0700)
Subject: One more bug in ldconfig -r handling.
X-Git-Tag: glibc-2.12~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49bd556d43f55d0bb6d76d57e846af85f0c986c9;p=thirdparty%2Fglibc.git

One more bug in ldconfig -r handling.
---

diff --git a/ChangeLog b/ChangeLog
index 4005fc82c58..85ab18394e7 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 b9f1cc2d1bc..4b9c4350f56 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