From owner-p4-projects@FreeBSD.ORG  Tue Jan 31 20:59:01 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 1E64216A424; Tue, 31 Jan 2006 20:59:01 +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 D499D16A420
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 20:59:00 +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 62F7743D48
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 20:59:00 +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 k0VKx0Aj078690
	for <perforce@freebsd.org>; Tue, 31 Jan 2006 20:59:00 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 k0VKx0pQ078687
	for perforce@freebsd.org; Tue, 31 Jan 2006 20:59:00 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 31 Jan 2006 20:59:00 GMT
Message-Id: <200601312059.k0VKx0pQ078687@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 90829 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 20:59:02 -0000

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

Change 90829 by rwatson@rwatson_peppercorn on 2006/01/31 20:58:26

	Mildly resort kernel version of audit.h to more resemble the
	OpenBSM version; slight style changes.

Affected files ...

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

Differences ...

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

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#20 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#21 $
  */
 
 #ifndef _BSM_AUDIT_H
@@ -45,21 +45,14 @@
 #define	MAX_AUDIT_RECORD_SIZE	4096
 #define	MIN_AUDIT_FILE_SIZE	(512 * 1024)
 
-/* The special device filename */
-#define AUDITDEV_FILENAME "audit"
-
-/*
- * File that will be read for trigger events from the kerenl
- */
-#define AUDIT_TRIGGER_FILE	"/dev/audit"
-
 /*
  * Minimum noumber of free blocks on the filesystem containing the audit
  * log necessary to avoid a hard log rotation. DO NOT SET THIS VALUE TO 0
  * as the kernel does an unsigned compare, plus we want to leave a few blocks
  * free so userspace can terminate the log, etc.
  */
-#define AUDIT_HARD_LIMIT_FREE_BLOCKS	4
+#define	AUDIT_HARD_LIMIT_FREE_BLOCKS	4
+
 /*
  * Triggers for the audit daemon
  */
@@ -72,11 +65,16 @@
 #define	AUDIT_TRIGGER_MAX		5
 
 /*
- * File that will be read for trigger events from the kernel
+ * File that will be read for trigger events from the kernel.
  */
 #define	AUDIT_TRIGGER_FILE	"/dev/audit"
 
 /*
+ * The special device filename.
+ */
+#define	AUDITDEV_FILENAME	"audit"
+
+/*
  * Pre-defined audit IDs
  */
 #define	AU_DEFAUDITID	-1