From e2102c142234bd7042fb2623d783a1fba8e5e428 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 29 Mar 1998 21:14:40 +0000 Subject: Update. 1998-03-29 20:59 Ulrich Drepper * elf/Makefile: Fix typo. * elf/ldd.bash.in: Collect output of ldd --verify in verify_out. * elf/ldd.sh.in: Likewise. * elf/ldsodefs.h: Declare _dl_correct_cache_id. * elf/rtld.c (dl_main): In --verify mode allow platform specifc action. Use strsep correctly. (process_envvars): Allow platform specific variables. * sysdeps/generic/dl-cache.c (_dl_correct_cache_id): New variable. (_dl_load_cache_lookup): Test cache IDs found against _dl_correct_cache_id. * sysdeps/generic/dl-librecon.h: New file. * sysdeps/unix/sysv/linux/dl-librecon.h: New file. * sysdeps/unix/sysv/linux/lddlibc4.c: Include error.h. * sysdeps/unix/sysv/linux/ldd-rewrite.sed: New file. --- sysdeps/generic/dl-cache.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'sysdeps/generic/dl-cache.c') diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index 5aa1ea20f3..da7d2e49dd 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -44,6 +44,10 @@ struct cache_file } libs[0]; }; +/* This is the cache ID we expect. Normally it is 3 for glibc linked + binaries. */ +int _dl_correct_cache_id = 3; + /* Look up NAME in ld.so.cache and return the file name stored there, or null if none is found. */ @@ -92,12 +96,12 @@ _dl_load_cache_lookup (const char *name) ! strcmp (name, ((const char *) &cache->libs[cache->nlibs] + cache->libs[i].key))) { - if ((best == NULL) || (cache->libs[i].flags == 3)) + if ((best == NULL) || (cache->libs[i].flags == _dl_correct_cache_id)) { best = ((const char *) &cache->libs[cache->nlibs] + cache->libs[i].value); - if (cache->libs[i].flags == 3) + if (cache->libs[i].flags == _dl_correct_cache_id) /* We've found an exact match for the shared object and no general `ELF' release. Stop searching. */ break; -- cgit v1.2.3