summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-01-16 01:25:39 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-01-16 01:25:39 +0000
commitc6b3a1578ef6ee7e2e5497a8bcd829574599cebb (patch)
tree4c58504b7021c4fa66144797a84ad2747183cd8b /gnu/usr.bin
parentc0922e721c3f9ab788a1334958cfbc34090807ab (diff)
from netbsd:
Relax checking of minor version number in `findhint()'. Also use the directories from the hints (v.2) file for directory traversing. This should take care of PR#1146.
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/ld/rtld/rtld.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c
index 512296d8ad6..750c41b638c 100644
--- a/gnu/usr.bin/ld/rtld/rtld.c
+++ b/gnu/usr.bin/ld/rtld/rtld.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.c,v 1.42 1996/01/09 00:02:28 pk Exp $ */
+/* $NetBSD: rtld.c,v 1.43 1996/01/14 00:35:17 pk Exp $ */
/*
* Copyright (c) 1993 Paul Kranenburg
* All rights reserved.
@@ -1086,6 +1086,7 @@ static long hsize;
static struct hints_header *hheader;
static struct hints_bucket *hbuckets;
static char *hstrtab;
+static char *hint_search_path = "";
#define HINTS_VALID (hheader != NULL && hheader != (struct hints_header *)-1)
@@ -1138,6 +1139,8 @@ maphints()
hbuckets = (struct hints_bucket *)(addr + hheader->hh_hashtab);
hstrtab = (char *)(addr + hheader->hh_strtab);
+ if (hheader->hh_version >= LD_HINTS_VERSION_2)
+ hint_search_path = hstrtab + hheader->hh_dirlist;
}
static void
@@ -1195,7 +1198,7 @@ findhint(name, major, minor, prefered_path)
if (strcmp(name, hstrtab + bp->hi_namex) == 0) {
/* It's `name', check version numbers */
if (bp->hi_major == major &&
- (bp->hi_ndewey < 2 || bp->hi_minor == minor)) {
+ (bp->hi_ndewey < 2 || bp->hi_minor >= minor)) {
if (prefered_path == NULL ||
strncmp(prefered_path,
hstrtab + bp->hi_pathx,
@@ -1272,7 +1275,9 @@ lose:
/* No hints available for name */
*usehints = 0;
realminor = -1;
+ add_search_path(hint_search_path);
cp = (char *)findshlib(name, &major, &realminor, 0);
+ remove_search_path(hint_search_path);
if (cp) {
if (realminor < minor && !ld_suppress_warnings)
warnx("warning: lib%s.so.%d.%d: "