From owner-p4-projects@FreeBSD.ORG  Mon Feb  1 15:03:44 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 05CD01065693; Mon,  1 Feb 2010 15:03:44 +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 B56E2106568D
	for <perforce@FreeBSD.org>; Mon,  1 Feb 2010 15:03:43 +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 A1ABD8FC14
	for <perforce@FreeBSD.org>; Mon,  1 Feb 2010 15:03:43 +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 o11F3hoa070930
	for <perforce@FreeBSD.org>; Mon, 1 Feb 2010 15:03:43 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o11F3hdF070928
	for perforce@freebsd.org; Mon, 1 Feb 2010 15:03:43 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 1 Feb 2010 15:03:43 GMT
Message-Id: <201002011503.o11F3hdF070928@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 174092 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 15:03:44 -0000

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

Change 174092 by jona@jona-belle-freebsd8 on 2010/02/01 15:03:13

	ld_libdirs(int**) => ld_libdirs(int*,int*)

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libc/gen/ld_libdirs.c#1 add
.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#10 edit
.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#9 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#10 (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#9 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#10 $
  */
 
 #ifndef _LIBCAPABILITY_H_
@@ -222,9 +222,11 @@
  */
 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);
+/*
+ * If this call fails because the buffer 'fds' is too small, 'fdlen' will contain
+ * the size of the array which is actually required.
+ */
+int	ld_libdirs(int *fds, int *fdlen);
 
 /*
  * Applications may declare an alternative entry point to the default ELF

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#9 (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_host.c#8 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#9 $
  */
 
 #include <sys/param.h>