From owner-p4-projects@FreeBSD.ORG  Tue Jan 31 21:02:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2B19216A423; Tue, 31 Jan 2006 21:02:05 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 C779616A420
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 21:02:04 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8CC2243D46
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 21:02:04 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0VL24OA078905
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 21:02:04 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0VL24It078902
	for perforce@freebsd.org; Tue, 31 Jan 2006 21:02:04 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 31 Jan 2006 21:02:04 GMT
Message-Id: <200601312102.k0VL24It078902@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>
Cc: 
Subject: PERFORCE change 90830 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 31 Jan 2006 21:02:06 -0000

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

Change 90830 by rwatson@rwatson_peppercorn on 2006/01/31 21:01:03

	Sync to OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 $
  */
 
 #ifndef _BSM_AUDIT_H
@@ -327,8 +327,7 @@
 };
 typedef	struct au_evclass_map	au_evclass_map_t;
 
-#ifndef _KERNEL
-
+#if !defined(_KERNEL) && !defined(KERNEL)
 int	audit(const void *, int);
 int	auditon(int, void *, int);
 int	auditctl(const char *);
@@ -338,8 +337,7 @@
 int	setaudit(const struct auditinfo *);
 int	getaudit_addr(struct auditinfo_addr *, int);
 int	setaudit_addr(const struct auditinfo_addr *, int);
-
-#endif /* !_KERNEL */
+#endif /* defined(_KERNEL) || defined(KERNEL) */
 
 __END_DECLS