From owner-p4-projects@FreeBSD.ORG  Tue Jun 29 00:55:27 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 839FB16A4D0; Tue, 29 Jun 2004 00:55:27 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5B88716A4CE
	for <perforce@freebsd.org>; Tue, 29 Jun 2004 00:55:27 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3948843D39
	for <perforce@freebsd.org>; Tue, 29 Jun 2004 00:55:27 +0000 (GMT)
	(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5T0tRhA070207
	for <perforce@freebsd.org>; Tue, 29 Jun 2004 00:55:27 GMT
	(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5T0tQ0d070204
	for perforce@freebsd.org; Tue, 29 Jun 2004 00:55:26 GMT
	(envelope-from wsalamon@computer.org)
Date: Tue, 29 Jun 2004 00:55:26 GMT
Message-Id: <200406290055.i5T0tQ0d070204@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 56036 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 29 Jun 2004 00:55:28 -0000

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 {\