From owner-p4-projects@FreeBSD.ORG  Wed Jul  5 12:11:42 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 8D01616A4DE; Wed,  5 Jul 2006 12:11:42 +0000 (UTC)
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 6873E16A4DA
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 12:11:42 +0000 (UTC)
	(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 F0B4F43D5F
	for <perforce@freebsd.org>; Wed,  5 Jul 2006 12:11:40 +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.6/8.13.6) with ESMTP id k65CBeJ9021028
	for <perforce@freebsd.org>; Wed, 5 Jul 2006 12:11:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k65CBeKM021025
	for perforce@freebsd.org; Wed, 5 Jul 2006 12:11:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 5 Jul 2006 12:11:40 GMT
Message-Id: <200607051211.k65CBeKM021025@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 100619 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: Wed, 05 Jul 2006 12:11:42 -0000

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

Change 100619 by rwatson@rwatson_zoo on 2006/07/05 12:10:44

	Adopt OpenSolaris constant values for audit configuration flags.
	Leave the old values in for the time being for reference purposes.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 (text+ko) ====

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#16 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#17 $
  */
 
 #ifndef _BSM_AUDIT_H
@@ -146,6 +146,7 @@
 /*
  * Audit policy controls.
  */
+#ifdef OLD_WORLD_ORDER
 #define	AUDIT_CNT	0x0001
 #define	AUDIT_AHLT	0x0002
 #define	AUDIT_ARGV	0x0004
@@ -157,6 +158,22 @@
 #define	AUDIT_GROUP	0x0100
 #define	AUDIT_TRAIL	0x0200
 #define	AUDIT_PATH	0x0400
+#else	/* !OLD_WORLD_ORDER */
+#define	AUDIT_CNT	0x0001
+#define	AUDIT_AHLT	0x0002
+#define	AUDIT_ARGV	0x0004
+#define	AUDIT_ARGE	0x0008
+#define	AUDIT_SEQ	0x0010
+#define	AUDIT_WINDATA	0x0020
+#define	AUDIT_USER	0x0040
+#define	AUDIT_GROUP	0x0080
+#define	AUDIT_TRAIL	0x0100
+#define	AUDIT_PATH	0x0200
+#define	AUDIT_SCNT	0x0400
+#define	AUDIT_PUBLIC	0x0800
+#define	AUDIT_ZONENAME	0x1000
+#define	AUDIT_PERZONE	0x2000
+#endif	/* !OLD_WORLD_ORDER */
 
 /*
  * Audit queue control parameters