Fix aux cache handling in ldconfig with chroot.

(cherry picked from commit 4bc2bcba67e870778fb9397f29435ee1b66bebf3)

diff --git a/ChangeLog b/ChangeLog
index 29418126485eff3df60d6ec7ca11ee1808831859..26c4e2f245ca32a26f7658730a1e2313fd83ecc5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-05  Ulrich Drepper  <drepper@redhat.com>
+
+       [BZ #11149]
+       * elf/ldconfig.c (main): Respect chroot setting when looking for
+       the aux cache.
+
 2010-04-04  Ulrich Drepper  <drepper@redhat.com>
 
        [BZ #11043]

diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 78a0f0c2a88a4fc77844ee7bacc4871d5427e535..76075278c0317a8f42db529489ef493e8be2581d 100644 (file)
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1305,11 +1305,9 @@ main (int argc, char **argv)
                                  p ? (*p = '\0', cache_file) : "/");
 
       if (canon == NULL)
-       {
-         error (EXIT_FAILURE, errno,
-                _("Can't open cache file directory %s\n"),
-                p ? cache_file : "/");
-       }
+       error (EXIT_FAILURE, errno,
+              _("Can't open cache file directory %s\n"),
+              p ? cache_file : "/");
 
       if (p)
        ++p;
@@ -1346,8 +1344,17 @@ main (int argc, char **argv)
        add_system_dir (LIBDIR);
     }
 
+  char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
+  if (opt_chroot)
+    {
+      aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
+      if (aux_cache_file == NULL)
+       error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
+              _PATH_LDCONFIG_AUX_CACHE);
+    }
+
   if (! opt_ignore_aux_cache)
-    load_aux_cache (_PATH_LDCONFIG_AUX_CACHE);
+    load_aux_cache (aux_cache_file);
   else
     init_aux_cache ();
 
@@ -1356,7 +1363,7 @@ main (int argc, char **argv)
   if (opt_build_cache)
     {
       save_cache (cache_file);
-      save_aux_cache (_PATH_LDCONFIG_AUX_CACHE);
+      save_aux_cache (aux_cache_file);
     }
 
   return 0;