Skip to content

Commit

Permalink
One more bug in ldconfig -r handling.
Browse files Browse the repository at this point in the history
  • Loading branch information
Ulrich Drepper committed May 3, 2010
1 parent 8497559 commit 49bd556
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion elf/ldconfig.c
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 49bd556

Please sign in to comment.