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: fedora/glibc-2.11.1-7~1^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ef4dbaf6d8faa91ff42a5d7b8b2c29f1c22bed0;p=thirdparty%2Fglibc.git

One more bug in ldconfig -r handling.

(cherry picked from commit 49bd556d43f55d0bb6d76d57e846af85f0c986c9)
---

diff --git a/ChangeLog b/ChangeLog
index eb9a5779184..48f9aa93390 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-05-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* misc/mntent_r.c (encode_name): The slow loop handles newlines so we
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 76075278c03..0d07a6075ae 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