One more bug in ldconfig -r handling.

(cherry picked from commit 49bd556d43f55d0bb6d76d57e846af85f0c986c9)

diff --git a/ChangeLog b/ChangeLog
index eb9a577918497a4f68e05edf78668cda82b7070f..48f9aa93390ce6152272c53ffe93256081a5da00 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-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 76075278c0317a8f42db529489ef493e8be2581d..0d07a6075ae72c8c57af158f188d11197ae4ce3b 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