From owner-p4-projects@FreeBSD.ORG  Mon Feb  1 11:19:58 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0B5471065694; Mon,  1 Feb 2010 11:19:57 +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 8889E106568F
	for <perforce@FreeBSD.org>; Mon,  1 Feb 2010 11:19:57 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 75B628FC20
	for <perforce@FreeBSD.org>; Mon,  1 Feb 2010 11:19:57 +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 o11BJvdR035014
	for <perforce@FreeBSD.org>; Mon, 1 Feb 2010 11:19:57 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o11BJv3G035012
	for perforce@freebsd.org; Mon, 1 Feb 2010 11:19:57 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 1 Feb 2010 11:19:57 GMT
Message-Id: <201002011119.o11BJv3G035012@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jona@FreeBSD.org using -f
From: Jonathan Anderson <jona@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174076 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 01 Feb 2010 11:19:58 -0000

http://p4web.freebsd.org/chv.cgi?CH=174076

Change 174076 by jona@jona-belle-freebsd8 on 2010/02/01 11:19:25

	Added the weak symbol ld_libdirs()

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#16 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#18 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#7 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Makefile.inc#16 (text+ko) ====

@@ -20,7 +20,7 @@
 	getpeereid.c getprogname.c getpwent.c getttyent.c \
 	getusershell.c getvfsbyname.c glob.c \
 	initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
-	ld_libcache.c ld_sandbox.c \
+	ld_libcache.c ld_libdirs.c ld_sandbox.c \
 	lockf.c lrand48.c mrand48.c nftw.c nice.c \
 	nlist.c nrand48.c opendir.c \
 	pause.c pmadvise.c popen.c posix_spawn.c \

==== //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/Symbol.map#18 (text) ====

@@ -373,6 +373,7 @@
 	ld_libcache_add;
 	ld_libcache_lookup;
 	ld_insandbox;
+	ld_libdirs;
 };
 
 FBSDprivate_1.0 {

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#7 (text+ko) ====

@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#6 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#7 $
  */
 
 #ifndef _LIBCAPABILITY_H_
@@ -224,6 +224,9 @@
 int	ld_libcache_lookup(const char *libname, int *fdp);
 int	ld_insandbox(void);
 
+/* If this call is successful, the caller is responsible for freeing 'fds'. */
+int	ld_libdirs(int **fds);
+
 /*
  * Applications may declare an alternative entry point to the default ELF
  * entry point for their binary, which will be used in preference to 'main'