From owner-p4-projects@FreeBSD.ORG  Fri Dec  2 23:59:47 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5262A16A422; Fri,  2 Dec 2005 23:59:47 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 143AC16A41F
	for <perforce@freebsd.org>; Fri,  2 Dec 2005 23:59:47 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B7E4143D49
	for <perforce@freebsd.org>; Fri,  2 Dec 2005 23:59:45 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB2NxjLH092102
	for <perforce@freebsd.org>; Fri, 2 Dec 2005 23:59:45 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB2NxjcT092099
	for perforce@freebsd.org; Fri, 2 Dec 2005 23:59:45 GMT
	(envelope-from wsalamon@computer.org)
Date: Fri, 2 Dec 2005 23:59:45 GMT
Message-Id: <200512022359.jB2NxjcT092099@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87663 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: Fri, 02 Dec 2005 23:59:48 -0000

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

Change 87663 by wsalamon@gretsch on 2005/12/02 23:58:50

	Audit the fd only once when dealing with a fd-based operation.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#31 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#31 (text+ko) ====

@@ -207,17 +207,13 @@
 } while (0)
 
 #define FD_VNODE1_TOKENS	do {					\
-	if (ARG_IS_VALID(kar, ARG_FD)) {				\
-		tok = au_to_arg32(1, "fd", ar->ar_arg_fd);		\
-		kau_write(rec, tok);					\
-	}								\
 	if (ARG_IS_VALID(kar, ARG_VNODE1)) {				\
-		tok = au_to_attr32(&ar->ar_arg_vnode1);			\
-		kau_write(rec, tok);					\
 		if (ARG_IS_VALID(kar, ARG_FD)) {			\
 			tok = au_to_arg32(1, "fd", ar->ar_arg_fd);	\
 			kau_write(rec, tok);				\
 		}							\
+		tok = au_to_attr32(&ar->ar_arg_vnode1);			\
+		kau_write(rec, tok);					\
 	} else {							\
 		if (ARG_IS_VALID(kar, ARG_FD)) {			\
 			tok = au_to_arg32(1, "non-file: fd", ar->ar_arg_fd);\