PERFORCE change 90829 for review

[Robert Watson]

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

Change 90829 by rwatson at 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