PERFORCE change 165402 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=165402

Change 165402 by rwatson at rwatson_cinnamon on 2009/06/29 14:24:21

	When disabling LD_PRELOAD object loading and initializing, I
	accidentially also disabled init functions on other shared objects,
	which broke libthr.  Fix this.
	
	Reported by:	jona

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#22 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.c#22 (text+ko) ====

@@ -360,11 +360,9 @@
     const char *argv0;
     Objlist_Entry *entry;
     Obj_Entry *obj;
-#ifndef IN_RTLD_CAP
     Obj_Entry **preload_tail;
     Objlist initlist;
     int lockstate;
-#endif
 
     /*
      * On entry, the dynamic linker itself has not been relocated yet.
@@ -571,8 +569,8 @@
     dbg("loading LD_PRELOAD libraries");
     if (load_preload_objects() == -1)
 	die();
+#endif
     preload_tail = obj_tail;
-#endif
 
     dbg("loading needed objects");
     if (load_needed_objects(obj_main) == -1)
@@ -629,20 +627,16 @@
     dbg("initializing thread locks");
     lockdflt_init();
 
-#ifndef IN_RTLD_CAP
     /* Make a list of init functions to call. */
     objlist_init(&initlist);
     initlist_add_objects(obj_list, preload_tail, &initlist);
-#endif
 
     r_debug_state(NULL, &obj_main->linkmap); /* say hello to gdb! */
 
-#ifndef IN_RTLD_CAP
     lockstate = wlock_acquire(rtld_bind_lock);
     objlist_call_init(&initlist, &lockstate);
     objlist_clear(&initlist);
     wlock_release(rtld_bind_lock, lockstate);
-#endif
 
     dbg("transferring control to program entry point = %p", obj_main->entry);