summaryrefslogtreecommitdiffstats
path: root/libexec
diff options
context:
space:
mode:
authorjdp <jdp@FreeBSD.org>2002-01-25 16:35:43 +0000
committerjdp <jdp@FreeBSD.org>2002-01-25 16:35:43 +0000
commitffe127d198476c77e712ea72cbd62631f4234dd1 (patch)
treeb586e0d7d333d6548267d3c2860c73749a1f2985 /libexec
parentd021da72fe1f0e17a65b88e33f0789d27c77b31f (diff)
downloadFreeBSD-src-ffe127d198476c77e712ea72cbd62631f4234dd1.zip
FreeBSD-src-ffe127d198476c77e712ea72cbd62631f4234dd1.tar.gz
Change the library search order so that LD_LIBRARY_PATH overrides
all others. PR: bin/28191 MFC after: 2 weeks
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rtld-elf/rtld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 94ea8fd..defa4f8 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -810,9 +810,9 @@ find_library(const char *name, const Obj_Entry *refobj)
dbg(" Searching for \"%s\"", name);
- if ((refobj != NULL &&
+ if ((pathname = search_library_path(name, ld_library_path)) != NULL ||
+ (refobj != NULL &&
(pathname = search_library_path(name, refobj->rpath)) != NULL) ||
- (pathname = search_library_path(name, ld_library_path)) != NULL ||
(pathname = search_library_path(name, gethints())) != NULL ||
(pathname = search_library_path(name, STANDARD_LIBRARY_PATH)) != NULL)
return pathname;
OpenPOWER on IntegriCloud