PERFORCE change 112773 for review

[Robert Watson]

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

Change 112773 by rwatson at rwatson_zoo on 2007/01/11 15:18:32

	Fix compile nits due to merging.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm.c#26 edit

Differences ...

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

@@ -440,6 +440,16 @@
 	case AUE_RECVMSG:
 	case AUE_SEND:
 	case AUE_SENDFILE:
+		/*
+		 * XXXRW: While sendfile() is effectively a combination of
+		 * read() and write(), it is useful to audit if only because
+		 * it performs IPC/network I/O.  We will need to eventually
+		 * audit the following information to be complete:
+		 *
+		 * - socket information
+		 * - file descriptor information for two file descriptors
+		 * - file information
+		 */
 	case AUE_SENDMSG:
 	case AUE_SENDTO:
 		/*
@@ -486,19 +496,6 @@
 		}
 		break;
 
-	case AUE_SENDFILE:
-		/*
-		 * XXXRW: While sendfile() is effectively a combination of
-		 * read() and write(), it is useful to audit if only because
-		 * it performs IPC/network I/O.  We will need to eventually
-		 * audit the following information to be complete:
-		 *
-		 * - socket information
-		 * - file descriptor information for two file descriptors
-		 * - file information
-		 */
-		break;
-
 	case AUE_ACCT:
 		if (ARG_IS_VALID(kar, ARG_UPATH1)) {
 			UPATH1_VNODE1_TOKENS;
@@ -948,7 +945,6 @@
 		break;
 
 	case AUE_MOUNT:
-	case AUE_NMOUNT:
 		/* XXX Need to handle NFS mounts */
 		if (ARG_IS_VALID(kar, ARG_FFLAGS)) {
 			tok = au_to_arg32(3, "flags", ar->ar_arg_fflags);