From owner-p4-projects@FreeBSD.ORG  Mon Jun 29 14:24:48 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 266991065674; Mon, 29 Jun 2009 14:24:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D0BBC1065670
	for <perforce@freebsd.org>; Mon, 29 Jun 2009 14:24:47 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BD6068FC23
	for <perforce@freebsd.org>; Mon, 29 Jun 2009 14:24:47 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5TEOlEm030656
	for <perforce@freebsd.org>; Mon, 29 Jun 2009 14:24:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5TEOlXV030654
	for perforce@freebsd.org; Mon, 29 Jun 2009 14:24:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 29 Jun 2009 14:24:47 GMT
Message-Id: <200906291424.n5TEOlXV030654@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 165402 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 29 Jun 2009 14:24:48 -0000

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

Change 165402 by rwatson@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);