From owner-p4-projects@FreeBSD.ORG  Wed Feb  3 09:27:39 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8D1F41065679; Wed,  3 Feb 2010 09:27:39 +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 D89391065672
	for <perforce@freebsd.org>; Wed,  3 Feb 2010 09:27:38 +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 C55278FC12
	for <perforce@freebsd.org>; Wed,  3 Feb 2010 09:27:38 +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 o139RcuR024613
	for <perforce@freebsd.org>; Wed, 3 Feb 2010 09:27:38 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 o139Rc49024611
	for perforce@freebsd.org; Wed, 3 Feb 2010 09:27:38 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 3 Feb 2010 09:27:38 GMT
Message-Id: <201002030927.o139Rc49024611@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 174211 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: Wed, 03 Feb 2010 09:27:39 -0000

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

Change 174211 by rwatson@rwatson_vimage_client on 2010/02/03 09:27:04

	There's no IN_CAP_MODE definition for libcapsicum, so just test for
	a negative fd_rtld before closing.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#16 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#16 (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#15 $
+ * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#16 $
  */
 
 #include <sys/param.h>
@@ -312,9 +312,8 @@
 		    binname, argv, fds);
 		exit(-1);
 	}
-#ifndef IN_CAP_MODE
-	close(fd_rtld);
-#endif
+	if (fd_rtld != -1)
+		close(fd_rtld);
 	close(fd_sockpair[1]);
 
 	lcsp->lcs_fd_procdesc = fd_procdesc;
@@ -330,10 +329,8 @@
 		close(fd_sockpair[0]);
 	if (fd_sockpair[1] != -1)
 		close(fd_sockpair[1]);
-#ifndef IN_CAP_MODE
 	if (fd_rtld != -1)
 		close(fd_rtld);
-#endif
 	if (lcsp != NULL)
 		free(lcsp);
 	errno = error;