PERFORCE change 87663 for review

[Wayne Salamon]

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

Change 87663 by wsalamon at 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);\
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message