PERFORCE change 84348 for review

[Robert Watson]

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

Change 84348 by rwatson at rwatson_zoo on 2005/09/27 14:46:37

	Rename sys/bsm/audit_kernel.h to sys/security/audit/audit.h, in
	order to more clearly separate APIs and data structures visible
	to user space from those visible only in the kernel.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_kernel.h#18 delete
.. //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#7 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#6 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#10 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#8 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#10 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#7 edit
.. //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#15 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#1 branch
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_klib.h#6 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#40 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#14 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#13 edit
.. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/i386/i386/trap.c#7 (text+ko) ====

@@ -77,7 +77,7 @@
 #ifdef HWPMC_HOOKS
 #include <sys/pmckern.h>
 #endif
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

==== //depot/projects/trustedbsd/audit3/sys/kern/init_main.c#6 (text+ko) ====

@@ -76,7 +76,7 @@
 
 #include <machine/cpu.h>
 
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
 
 #include <vm/vm.h>
 #include <vm/vm_param.h>

==== //depot/projects/trustedbsd/audit3/sys/kern/kern_descrip.c#10 (text+ko) ====

@@ -39,9 +39,6 @@
 
 #include "opt_compat.h"
 
-#include <bsm/audit_kernel.h>
-#include <bsm/audit_kernel.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 
@@ -70,6 +67,8 @@
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 
+#include <security/audit/audit.h>
+
 #include <vm/uma.h>
 
 static MALLOC_DEFINE(M_FILEDESC, "file desc", "Open file descriptor table");

==== //depot/projects/trustedbsd/audit3/sys/kern/kern_exit.c#8 (text+ko) ====

@@ -70,7 +70,7 @@
 #include <sys/ktrace.h>
 #endif
 
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>

==== //depot/projects/trustedbsd/audit3/sys/kern/kern_fork.c#10 (text+ko) ====

@@ -66,7 +66,7 @@
 #include <sys/sx.h>
 #include <sys/signalvar.h>
 
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>

==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_lookup.c#7 (text+ko) ====

@@ -41,8 +41,6 @@
 #include "opt_mac.h"
 #include "opt_vfs.h"
 
-#include <bsm/audit_kernel.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -60,6 +58,8 @@
 #include <sys/ktrace.h>
 #endif
 
+#include <security/audit/audit.h>
+
 #include <vm/uma.h>
 
 #define NAMEI_DIAGNOSTIC 1

==== //depot/projects/trustedbsd/audit3/sys/kern/vfs_syscalls.c#15 (text+ko) ====

@@ -40,9 +40,6 @@
 #include "opt_compat.h"
 #include "opt_mac.h"
 
-#include <bsm/audit_kernel.h>
-#include <bsm/audit_kevents.h>
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bio.h>
@@ -73,6 +70,9 @@
 
 #include <machine/stdarg.h>
 
+#include <security/audit/audit.h>
+#include <bsm/audit_kevents.h>
+
 #include <vm/vm.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_klib.h#6 (text+ko) ====

@@ -29,7 +29,7 @@
 #define AU_PRS_BOTH     (AU_PRS_SUCCESS|AU_PRS_FAILURE)
 
 #ifdef _KERNEL
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
 /*
  * Some of the BSM tokenizer functions take different parameters in the
  * kernel implementations in order to save the copying of large kernel

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

@@ -52,7 +52,7 @@
 
 #include <bsm/audit.h>
 #include <bsm/audit_kevents.h>
-#include <bsm/audit_kernel.h>
+#include <security/audit/audit.h>
 #include <security/audit/audit_klib.h>
 
 /*

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

@@ -34,8 +34,9 @@
 #include <bsm/audit.h>
 #include <bsm/audit_internal.h>
 #include <bsm/audit_record.h>
-#include <bsm/audit_kernel.h>
 #include <bsm/audit_kevents.h>
+
+#include <security/audit/audit.h>
 #include <security/audit/audit_klib.h>
 
 #include <netinet/in_systm.h>

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

@@ -34,8 +34,8 @@
 #include <sys/vnode.h>
 
 #include <bsm/audit.h>
-#include <bsm/audit_kernel.h>
 #include <bsm/audit_kevents.h>
+#include <security/audit/audit.h>
 #include <security/audit/audit_klib.h>
 
 /*

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

@@ -50,8 +50,8 @@
 
 #include <bsm/audit.h>
 #include <bsm/audit_internal.h>
-#include <bsm/audit_kernel.h>
 #include <bsm/audit_record.h>
+#include <security/audit/audit.h>
 #include <security/audit/audit_klib.h>
 
 #define GET_TOKEN_AREA(t, dptr, length) \
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message