Date: Tue, 29 Jun 2004 00:55:26 GMT From: Wayne Salamon <wsalamon@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 56036 for review Message-ID: <200406290055.i5T0tQ0d070204@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=56036 Change 56036 by wsalamon@wsalamon_epi on 2004/06/29 00:54:33 Remove Darwin specific includes (mach, etc.), change include path for audit_klib.h. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#2 (text+ko) ==== @@ -48,21 +48,9 @@ #include <bsm/audit.h> #include <bsm/audit_kevents.h> -#include <bsm/audit_klib.h> +#include <security/audit/audit_klib.h> #include <bsm/audit_kernel.h> -#include <mach/message.h> -#include <mach/port.h> -#include <mach/host_special_ports.h> -#include <mach/audit_triggers.h> - -#include <kern/lock.h> -#include <kern/wait_queue.h> -#include <kern/zalloc.h> -#include <kern/kalloc.h> - -#include <audit.h> - #ifdef AUDIT /* @@ -78,6 +66,7 @@ #define AUDIT_PRINTF(X) #endif +#if 0 #if DIAGNOSTIC #if defined(assert) #undef assert() @@ -87,6 +76,8 @@ #else #include <kern/assert.h> #endif /* DIAGNOSTIC */ +#endif +#define assert(x) KASSERT(x, x) /* * Define the audit control flags. ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_audit.c#2 (text+ko) ==== @@ -34,14 +34,12 @@ #include <bsm/audit_record.h> #include <bsm/audit_kernel.h> #include <bsm/audit_kevents.h> -#include <bsm/audit_klib.h> +#include <security/audit/audit_klib.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <kern/lock.h> - /* The number of BSM records allocated. */ static int bsm_rec_count = 0; ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_klib.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ #include <bsm/audit.h> #include <bsm/audit_kernel.h> #include <bsm/audit_kevents.h> -#include <bsm/audit_klib.h> +#include <security/audit/audit_klib.h> /* * Initialize the system call to audit event mapping table. This table ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_bsm_token.c#2 (text+ko) ==== @@ -26,10 +26,8 @@ #include <bsm/audit.h> #include <bsm/audit_record.h> -#include <bsm/audit_klib.h> #include <bsm/audit_kernel.h> - -#include <kern/clock.h> +#include <security/audit/audit_klib.h> #define GET_TOKEN_AREA(tok, dptr, length) \ do {\help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406290055.i5T0tQ0d070204>