PERFORCE change 45101 for review

[Robert Watson]

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

Change 45101 by rwatson at rwatson_paprika on 2004/01/10 20:18:21

	More include files.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#3 edit
.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#3 (text+ko) ====

@@ -23,6 +23,9 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 #include <sys/param.h>
+#include <sys/condvar.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/fcntl.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
@@ -35,17 +38,15 @@
 #include <sys/uio.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <security/audit/audit.h>
-#include <security/audit/kern_audit.h>
 #include <sys/user.h>
 #include <sys/bsm_kevents.h>
-#include <security/audit/bsm_klib.h>
 #include <sys/syscall.h>
 #include <sys/malloc.h>
 #include <sys/un.h>
 
-#include <kern/lock.h>
-#include <kern/wait_queue.h>
+#include <security/audit/audit.h>
+#include <security/audit/kern_audit.h>
+#include <security/audit/bsm_klib.h>
 
 #ifdef AUDIT
 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#3 (text+ko) ====

@@ -30,17 +30,19 @@
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/fcntl.h>
-#include <security/audit/audit.h>
-#include <security/audit/kern_audit.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/bsm_token.h>
 #include <sys/bsm_kevents.h>
-#include <security/audit/bsm_klib.h>
 #include <sys/user.h>
+
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 
-#include <kern/lock.h>
+#include <security/audit/audit.h>
+#include <security/audit/kern_audit.h>
+#include <security/audit/bsm_klib.h>
 
 /* The number of BSM records allocated. */
 static int bsm_rec_count = 0; 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#3 (text+ko) ====

@@ -28,10 +28,11 @@
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/sem.h>
+#include <sys/bsm_kevents.h>
+
 #include <security/audit/audit.h>
 #include <security/audit/kern_audit.h>
-#include <sys/bsm_kevents.h>
-#include <sys/bsm_klib.h>
+#include <security/audit/bsm_klib.h>
 
 /*
  * Initialize the system call to audit event mapping table. This table 

==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#3 (text+ko) ====

@@ -24,9 +24,9 @@
  */
 #include <sys/types.h>
 #include <sys/bsm_token.h>      
-#include <security/audit/audit.h>      
 #include <sys/un.h>      
-#include <kern/clock.h>
+
+#include <security/audit/audit.h>
 
 #define GET_TOKEN_AREA(tok, dptr, length) \
         do {\
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message