From owner-p4-projects@FreeBSD.ORG  Sat Jan 10 19:57:02 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE5B116A4D1; Sat, 10 Jan 2004 19:57:01 -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 B88C716A4CE
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 19:57:01 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5547643D1D
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 19:57:00 -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 i0B3v00B038799
	for <perforce@freebsd.org>; Sat, 10 Jan 2004 19:57:00 -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 i0B3uxmP038795
	for perforce@freebsd.org; Sat, 10 Jan 2004 19:56:59 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 10 Jan 2004 19:56:59 -0800 (PST)
Message-Id: <200401110356.i0B3uxmP038795@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 45100 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 03:57:02 -0000

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

Change 45100 by rwatson@rwatson_paprika on 2004/01/10 19:56:31

	Kernel-internal include files in slightly different places
	on FreeBSD.

Affected files ...

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

Differences ...

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

@@ -35,11 +35,11 @@
 #include <sys/uio.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
-#include <sys/audit.h>
-#include <sys/kern_audit.h>
+#include <security/audit/audit.h>
+#include <security/audit/kern_audit.h>
 #include <sys/user.h>
 #include <sys/bsm_kevents.h>
-#include <sys/bsm_klib.h>
+#include <security/audit/bsm_klib.h>
 #include <sys/syscall.h>
 #include <sys/malloc.h>
 #include <sys/un.h>
@@ -62,6 +62,7 @@
 #define	AUDIT_PRINTF(X)
 #endif
 
+#if 0
 #if DIAGNOSTIC
 #if defined(assert)
 #undef assert()
@@ -71,6 +72,8 @@
 #else
 #include <kern/assert.h>
 #endif /* DIAGNOSTIC */
+#endif
+#define	assert	KASSERT
 
 /* 
  * Define the audit control flags.

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

@@ -30,11 +30,11 @@
 #include <sys/socket.h>
 #include <sys/queue.h>
 #include <sys/fcntl.h>
-#include <sys/audit.h>
-#include <sys/kern_audit.h>
+#include <security/audit/audit.h>
+#include <security/audit/kern_audit.h>
 #include <sys/bsm_token.h>
 #include <sys/bsm_kevents.h>
-#include <sys/bsm_klib.h>
+#include <security/audit/bsm_klib.h>
 #include <sys/user.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>

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

@@ -28,8 +28,8 @@
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/sem.h>
-#include <sys/audit.h>
-#include <sys/kern_audit.h>
+#include <security/audit/audit.h>
+#include <security/audit/kern_audit.h>
 #include <sys/bsm_kevents.h>
 #include <sys/bsm_klib.h>
 

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

@@ -24,7 +24,7 @@
  */
 #include <sys/types.h>
 #include <sys/bsm_token.h>      
-#include <sys/audit.h>      
+#include <security/audit/audit.h>      
 #include <sys/un.h>      
 #include <kern/clock.h>