OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

One more bug in ldconfig -r handling.

This commit is contained in:
Ulrich Drepper 2010-05-03 10:40:30 -07:00
parent 8497559725
commit 49bd556d43
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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
elf/ldconfig.c
View File

@ -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