 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.c,v 1.121 2008/09/27 03:52:05 macallan Exp $	 */
+/*	$NetBSD: rtld.c,v 1.122 2008/10/04 09:37:12 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: rtld.c,v 1.121 2008/09/27 03:52:05 macallan Exp $");
+__RCSID("$NetBSD: rtld.c,v 1.122 2008/10/04 09:37:12 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <dirent.h>
 @@ -879,32 +879,34 @@ dlsym(void *handle, const char *name)
 			abort();
+		}
 		break;
 	default:
 		if ((obj = _rtld_dlcheck(handle)) == NULL)
 			return NULL;
 		if (obj->mainprog) {
 			/* Search main program and all libraries loaded by it */
 			def = _rtld_symlook_list(name, hash, &_rtld_list_main,
 			    &defobj, false);
 		} else {
-			/*
+			Needed_Entry fake;
 			 * XXX - This isn't correct.  The search should include
-			 * the whole DAG rooted at the given object.
+			/* Search the object and all the libraries loaded by it. */
-			 */
+			fake.next = NULL;
-			def = _rtld_symlook_obj(name, hash, obj, false);
+			fake.obj = (Obj_Entry *)obj;
-			defobj = obj;
+			fake.name = 0;
 			def = _rtld_symlook_needed(name, hash, &fake, &defobj,
 			    false);
+		}
 		break;
+	}
 	if (def != NULL) {
 #ifdef __HAVE_FUNCTION_DESCRIPTORS
 		if (ELF_ST_TYPE(def->st_info) == STT_FUNC)
 			return (void *)_rtld_function_descriptor_alloc(defobj,
 			    def, 0);
 #endif /* __HAVE_FUNCTION_DESCRIPTORS */
 		return defobj->relocbase + def->st_value;
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rtld.h,v 1.78 2008/06/03 19:32:32 ad Exp $	 */
+/*	$NetBSD: rtld.h,v 1.79 2008/10/04 09:37:12 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -264,26 +264,28 @@ void _rtld_setup_pltgot(const Obj_Entry
 /* search.c */
 Obj_Entry *_rtld_load_library(const char *, const Obj_Entry *, int);
 /* symbol.c */
 unsigned long _rtld_elf_hash(const char *);
 const Elf_Sym *_rtld_symlook_obj(const char *, unsigned long,
     const Obj_Entry *, bool);
 const Elf_Sym *_rtld_find_symdef(unsigned long, const Obj_Entry *,
     const Obj_Entry **, bool);
 const Elf_Sym *_rtld_symlook_list(const char *, unsigned long,
     const Objlist *, const Obj_Entry **, bool);
 const Elf_Sym *_rtld_symlook_default(const char *, unsigned long,
     const Obj_Entry *, const Obj_Entry **, bool);
 const Elf_Sym *_rtld_symlook_needed(const char *, unsigned long,
     const Needed_Entry *, const Obj_Entry **, bool);
 /* map_object.c */
 Obj_Entry *_rtld_map_object(const char *, int, const struct stat *);
 void _rtld_obj_free(Obj_Entry *);
 Obj_Entry *_rtld_obj_new(void);
 /* function descriptors */
 #ifdef __HAVE_FUNCTION_DESCRIPTORS
 Elf_Addr _rtld_function_descriptor_alloc(const Obj_Entry *,
     const Elf_Sym *, Elf_Addr);
 const void *_rtld_function_descriptor_function(const void *);
 #endif /* __HAVE_FUNCTION_DESCRIPTORS */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: symbol.c,v 1.46 2008/07/24 04:39:25 matt Exp $	 */
+/*	$NetBSD: symbol.c,v 1.47 2008/10/04 09:37:12 skrll Exp $	 */
 /*
  * Copyright 1996 John D. Polstra.
  * Copyright 1996 Matt Thomas <matt@3am-software.com>
  * Copyright 2002 Charles M. Hannum <root@ihack.net>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Dynamic linker for ELF.
+ *
  * John Polstra <jdp@polstra.com>.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: symbol.c,v 1.46 2008/07/24 04:39:25 matt Exp $");
+__RCSID("$NetBSD: symbol.c,v 1.47 2008/10/04 09:37:12 skrll Exp $");
 #endif /* not lint */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <dirent.h>
 @@ -126,26 +126,76 @@ _rtld_symlook_list(const char *name, uns
 				def = symp;
 				defobj = elm->obj;
 				if (ELF_ST_BIND(def->st_info) != STB_WEAK)
 					break;
+			}
+		}
+	}
 	if (def != NULL)
 		*defobj_out = defobj;
 	return def;
+}
 /*
  * Search the symbol table of a shared object and all objects needed by it for
  * a symbol of the given name. Search order is breadth-first. Returns a pointer
  * to the symbol, or NULL if no definition was found.
  */
 const Elf_Sym *
 _rtld_symlook_needed(const char *name, unsigned long hash,
     const Needed_Entry *needed, const Obj_Entry **defobj_out, bool inplt)
+{
 	const Elf_Sym *def, *def_w;
 	const Needed_Entry *n;
 	const Obj_Entry *obj, *defobj, *defobj1;
 	def = def_w = NULL;
 	defobj = NULL;
 	for (n = needed; n != NULL; n = n->next) {
 		if ((obj = n->obj) == NULL ||
 		     (def = _rtld_symlook_obj(name, hash, obj, inplt)) == NULL)
 			continue;
 		defobj = obj;
 		if (ELF_ST_BIND(def->st_info) != STB_WEAK) {
 			*defobj_out = defobj;
 			return (def);
+		}
+	}
 	/*
 	 * Either the symbol definition has not been found in directly needed
 	 * objects, or the found symbol is weak.
 	 */
 	for (n = needed; n != NULL; n = n->next) {
 		if ((obj = n->obj) == NULL)
 			continue;
 		def_w = _rtld_symlook_needed(name, hash, obj->needed, &defobj1,
 		    inplt);
 		if (def_w == NULL)
 			continue;
 		if (def == NULL || ELF_ST_BIND(def_w->st_info) != STB_WEAK) {
 			def = def_w;
 			defobj = defobj1;
 			if (ELF_ST_BIND(def_w->st_info) != STB_WEAK)
 				break;
+		}
+	}
 	if (def != NULL)
 		*defobj_out = defobj;
 	return def;
+}
 /*
  * Search the symbol table of a single shared object for a symbol of
  * the given name.  Returns a pointer to the symbol, or NULL if no
  * definition was found.
+ *
  * The symbol's hash value is passed in for efficiency reasons; that
  * eliminates many recomputations of the hash value.
  */
 const Elf_Sym *
 _rtld_symlook_obj(const char *name, unsigned long hash,
     const Obj_Entry *obj, bool in_plt)
+{
 	unsigned long symnum;