One more bug in ldconfig -r handling.

diff --git a/ChangeLog b/ChangeLog
index 4005fc82c5845558138fe148f89097f2b245770f..85ab18394e71ddd7371d8162706062867410bc9a 100644 (file)
--- 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 b9f1cc2d1bc3c0423526dd669513cad53008a89a..4b9c4350f56b5f21ad15e46967b65ebfe571f55a 100644 (file)
--- 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