From owner-p4-projects@FreeBSD.ORG  Mon Jan 12 21:23:15 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9AE8516A4D1; Mon, 12 Jan 2004 21:23:15 -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 75CB616A4CE
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:23:15 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E58B443D5A
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:22:40 -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 i0D5Me0B004983
	for <perforce@freebsd.org>; Mon, 12 Jan 2004 21:22:40 -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 i0D5Me3t004980
	for perforce@freebsd.org; Mon, 12 Jan 2004 21:22:40 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 12 Jan 2004 21:22:40 -0800 (PST)
Message-Id: <200401130522.i0D5Me3t004980@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 45251 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, 13 Jan 2004 05:23:16 -0000

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

Change 45251 by rwatson@rwatson_paprika on 2004/01/12 21:22:10

	Include audit-private header file.
	
	Use _KERNEL instead of KERNEL.

Affected files ...

.. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#6 edit

Differences ...

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

@@ -38,6 +38,7 @@
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
+#include <security/audit/audit_private.h>
 #include <security/audit/kern_audit.h>
 
 #define GET_TOKEN_AREA(tok, dptr, length)				\
@@ -490,7 +491,7 @@
 	return t;
 }
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Kernel version of the add file token function, where the time value 
  * is passed in as an additional parameter.
@@ -1246,7 +1247,7 @@
 }
 
 
-#ifdef KERNEL
+#ifdef _KERNEL
 /*
  * Kernel version of the BSM header token functions. These versions take 
  * a timespec struct as an additional parameter in order to obtain the