d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow to specify targets by absolute paths in libmap.conf.

Browse Source 
Submitted by:	Tatu Kilappa <tatu.kilappa@iki.fi>
PR:	221032
MFC after:	2 weeks
This commit is contained in:
kib 2017-07-27 08:33:31 +00:00
parent d03d7f8708
commit f5d8337496
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libexec/rtld-elf/rtld.c
View File

@ -1590,20 +1590,21 @@ find_library(const char *xname, const Obj_Entry *refobj, int *fdp)
bool nodeflib, objgiven;
objgiven = refobj != NULL;
if (strchr(xname, '/') != NULL) { /* Hard coded pathname */
if (xname[0] != '/' && !trust) {
_rtld_error("Absolute pathname required for shared object \"%s\"",
xname);
return NULL;
}
return (origin_subst(__DECONST(Obj_Entry *, refobj),
__DECONST(char *, xname)));
}
if (libmap_disable || !objgiven ||
(name = lm_find(refobj->path, xname)) == NULL)
(name = lm_find(refobj->path, xname)) == NULL)
name = (char *)xname;
if (strchr(name, '/') != NULL) { /* Hard coded pathname */
if (name[0] != '/' && !trust) {
_rtld_error("Absolute pathname required for shared object \"%s\"",
name);
return (NULL);
}
return (origin_subst(__DECONST(Obj_Entry *, refobj),
__DECONST(char *, name)));
}
dbg(" Searching for \"%s\"", name);
/*