mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
* elf/dl-load.c (_dl_dst_count, _dl_dst_substitute): Handle $LIB
dynamic string tag. * elf/Makefile ($(objpfx)trusted-dirs.st): Make the output define DL_DST_LIB based on $(slibdir).
This commit is contained in:
@ -202,8 +202,8 @@ _dl_dst_count (const char *name, int is_path)
|
||||
++name;
|
||||
if ((len = is_dst (start, name, "ORIGIN", is_path,
|
||||
INTUSE(__libc_enable_secure))) != 0
|
||||
|| ((len = is_dst (start, name, "PLATFORM", is_path, 0))
|
||||
!= 0))
|
||||
|| (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0
|
||||
|| (len = is_dst (start, name, "LIB", is_path, 0)) != 0)
|
||||
++cnt;
|
||||
|
||||
name = strchr (name + len, '$');
|
||||
@ -239,9 +239,10 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result,
|
||||
if ((len = is_dst (start, name, "ORIGIN", is_path,
|
||||
INTUSE(__libc_enable_secure))) != 0)
|
||||
repl = l->l_origin;
|
||||
else if ((len = is_dst (start, name, "PLATFORM", is_path,
|
||||
0)) != 0)
|
||||
else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0)
|
||||
repl = GL(dl_platform);
|
||||
else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0)
|
||||
repl = DL_DST_LIB;
|
||||
|
||||
if (repl != NULL && repl != (const char *) -1)
|
||||
{
|
||||
|
Reference in New Issue
Block a user