Re: CVS: cvs.openbsd.org: src [shlib.c change]

[Assar Westerlund <assar@sics.se>]

> Whomever tested the reversion of ld/ld.so a couple of weeks ago
> didn't do a very good job.  Given these libraries:
> 
>         /usr/lib/libc.so.23.2
>         /usr/lib/libc.so.23.3
>         /usr/lib/libc.so.24.0
> 
> When starting a program linked against /usr/lib/libc.so.23.2 at boot
> time (in my specific case starting ntpd) the warning message:
> 
>         /usr/libexec/ld.so: warning: libc.so.24.0: minor version >= 2 \
>         expected, using it anyway

Care to try this patch?

/assar

Index: shlib.c
===================================================================
RCS file: /cvs/src/gnu/usr.bin/ld/shlib.c,v
retrieving revision 1.6
diff -u -w -u -w -r1.6 shlib.c
--- shlib.c	2000/01/02 06:18:41	1.6
+++ shlib.c	2000/01/14 04:39:18
@@ -251,10 +251,10 @@
 		if (dd == NULL)
 			continue;
 
-		might_take_it = 0;
 		while ((dp = readdir(dd)) != NULL) {
 			int	n;
 
+			might_take_it = 0;
 			if (do_dot_a && path == NULL &&
 					dp->d_namlen == len + 2 &&
 					strncmp(dp->d_name, lname, len) == 0 &&