From owner-p4-projects@FreeBSD.ORG  Sat Jan 10 20:18:28 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 465B516A4D1; Sat, 10 Jan 2004 20:18:28 -0800 (PST)
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 2257A16A4CE
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 20:18:28 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9632E43D2D
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 20:18:26 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0B4IQ0B043719
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 20:18:26 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0B4IQnT043716
	for perforce@freebsd.org; Sat, 10 Jan 2004 20:18:26 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 10 Jan 2004 20:18:26 -0800 (PST)
Message-Id: <200401110418.i0B4IQnT043716@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 45101 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: Sun, 11 Jan 2004 04:18:28 -0000

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

Change 45101 by rwatson@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 {\