From owner-p4-projects@FreeBSD.ORG  Sun Aug  9 15:17:24 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 30B8A1065670; Sun,  9 Aug 2009 15:17:24 +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 DD121106564A
	for <perforce@freebsd.org>; Sun,  9 Aug 2009 15:17:23 +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 CBEFD8FC1A
	for <perforce@freebsd.org>; Sun,  9 Aug 2009 15:17:23 +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 n79FHNIQ024291
	for <perforce@freebsd.org>; Sun, 9 Aug 2009 15:17:23 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 n79FHN3Q024289
	for perforce@freebsd.org; Sun, 9 Aug 2009 15:17:23 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 9 Aug 2009 15:17:23 GMT
Message-Id: <200908091517.n79FHN3Q024289@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 167134 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: Sun, 09 Aug 2009 15:17:25 -0000

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

Change 167134 by rwatson@rwatson_freebsd_capabilities on 2009/08/09 15:17:07

	Remove mismerge for auditing of fd arguments in fexecve(2).

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#20 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/kern/kern_exec.c#20 (text+ko) ====

@@ -428,7 +428,6 @@
 	} else {
 		AUDIT_ARG_FD(args->fd);
 		/* XXXRW: Possibly should just be CAP_FEXECVE? */
-		AUDIT_ARG(fd, args->fd);
 		error = fgetvp_read(td, args->fd, CAP_READ | CAP_FEXECVE,
 		    &binvp);
 		if (error)