PERFORCE change 98532 for review

[Robert Watson]

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

Change 98532 by rwatson at rwatson_zoo on 2006/06/05 10:30:06

	Merge changes from OpenBSM 1.0 alpha 6 into kernel bsm include
	directory.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 integrate
.. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#12 integrate

Differences ...

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

@@ -30,7 +30,7 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#26 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#27 $
  * $FreeBSD: src/sys/bsm/audit.h,v 1.3 2006/03/04 16:54:21 rwatson Exp $
  */
 
@@ -282,11 +282,11 @@
 	unsigned int	as_version;
 	unsigned int	as_numevent;
 	int		as_generated;
-	int		as_nonattring;
+	int		as_nonattrib;
 	int		as_kernel;
 	int		as_audit;
 	int		as_auditctl;
-	int		as_enqueu;
+	int		as_enqueue;
 	int		as_written;
 	int		as_wblocked;
 	int		as_rblocked;

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

@@ -30,23 +30,15 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#11 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#12 $
  */
 
 #ifndef _BSM_AUDIT_RECORD_H_
 #define _BSM_AUDIT_RECORD_H_
 
-/* Various token id types */
-
 /*
- * Values inside the comments are not documented in the BSM pages and
- * have been picked up from the header files
- */
-
-/*
- * Values marked as XXX do not have a value defined in the BSM header files
+ * Token type identifiers.
  */
-
 #define	AUT_INVALID		0x00
 #define	AUT_OTHER_FILE32	0x11
 #define	AUT_OHEADER		0x12