From owner-p4-projects@FreeBSD.ORG  Mon Jul 27 22:00:51 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8E9CB10656AE; Mon, 27 Jul 2009 22:00:47 +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 0AC0410656B7
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 22:00:47 +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 E81E18FC1F
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 22:00:46 +0000 (UTC)
	(envelope-from jona@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6RM0k3u048303
	for <perforce@FreeBSD.org>; Mon, 27 Jul 2009 22:00:46 GMT
	(envelope-from jona@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6RM0kNt048301
	for perforce@freebsd.org; Mon, 27 Jul 2009 22:00:46 GMT
	(envelope-from jona@FreeBSD.org)
Date: Mon, 27 Jul 2009 22:00:46 GMT
Message-Id: <200907272200.n6RM0kNt048301@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>
Cc: 
Subject: PERFORCE change 166657 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, 27 Jul 2009 22:00:53 -0000

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

Change 166657 by jona@jona-trustedbsd-belle-vmware on 2009/07/27 22:00:14

	Receive one file descriptor at a time, not a set of file descriptors in one shot

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libuserangel/libuserangel.c#13 (text+ko) ====

@@ -356,18 +356,17 @@
 
 	if(ua_unmarshall_int(fdcountd, len) < 0) return -1;
 
-	uint32_t fdcount = *len;
-	int32_t fdarray[fdcount];
-
-	struct ua_datum *fd_datum = ua_recv(angel, fdarray, &fdcount);
-	if(!fd_datum) return -1;
-	*len = fdcount;
-
 	int buflen = 1024;
 	char buffer[buflen];
-	for(unsigned int i = 0; i < fdcount; i++)
+	for(int i = 0; i < *len; i++)
 	{
-		fds[i] = fdarray[i];
+		int32_t fd;
+		uint32_t count = 1;
+
+		struct ua_datum *fd_datum = ua_recv(angel, &fd, &count);
+		if(!fd_datum) return -1;
+
+		fds[i] = fd;
 
 		int namelen = buflen;
 		if(ua_unmarshall_string(fd_datum, buffer, &namelen) < 0) return -1;