From owner-p4-projects@FreeBSD.ORG  Sat Aug  8 18:47:52 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 18F6E10656FC; Sat,  8 Aug 2009 18:47:52 +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 BC91610656F9
	for <perforce@freebsd.org>; Sat,  8 Aug 2009 18:47:51 +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 A9A708FC1F
	for <perforce@freebsd.org>; Sat,  8 Aug 2009 18:47:51 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n78Ilp4I063984
	for <perforce@freebsd.org>; Sat, 8 Aug 2009 18:47:51 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 n78Ilp4Z063982
	for perforce@freebsd.org; Sat, 8 Aug 2009 18:47:51 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 8 Aug 2009 18:47:51 GMT
Message-Id: <200908081847.n78Ilp4Z063982@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 167112 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: Sat, 08 Aug 2009 18:47:53 -0000

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

Change 167112 by rwatson@rwatson_freebsd_capabilities on 2009/08/08 18:47:35

	Fix merge of rtld.c: we do need load_object() when in capability
	mode.

Affected files ...

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

Differences ...

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

@@ -123,8 +123,8 @@
 static int load_needed_objects(Obj_Entry *);
 #ifndef IN_RTLD_CAP
 static int load_preload_objects(void);
+#endif
 static Obj_Entry *load_object(const char *, const Obj_Entry *, int);
-#endif
 static Obj_Entry *obj_from_addr(const void *);
 static void objlist_call_fini(Objlist *, bool, int *);
 static void objlist_call_init(Objlist *, int *);