From b9ad4a7bf0552ca151aabee0fcd5733b960af430 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Mon, 25 Sep 2006 11:53:06 +0000
Subject: [PATCH] Resolve conflicts from OpenBSM 1.0 alpha 12 import.

Obtained from:	TrustedBSD Project
---
 contrib/openbsm/etc/audit_control | 3 ++-
 contrib/openbsm/etc/audit_event   | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/contrib/openbsm/etc/audit_control b/contrib/openbsm/etc/audit_control
index faa038c7b132..a711019f39ac 100644
--- a/contrib/openbsm/etc/audit_control
+++ b/contrib/openbsm/etc/audit_control
@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#4 $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_control#5 $
 # $FreeBSD$
 #
 dir:/var/audit
@@ -7,3 +7,4 @@ flags:lo
 minfree:20
 naflags:lo
 policy:cnt
+filesz:0
diff --git a/contrib/openbsm/etc/audit_event b/contrib/openbsm/etc/audit_event
index 15a099281fbe..c21f265e7010 100644
--- a/contrib/openbsm/etc/audit_event
+++ b/contrib/openbsm/etc/audit_event
@@ -1,5 +1,5 @@
 #
-# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#15 $
+# $P4: //depot/projects/trustedbsd/openbsm/etc/audit_event#16 $
 # $FreeBSD$
 #
 0:AUE_NULL:indir system call:no
@@ -419,6 +419,10 @@
 43114:AUE_KENV:kenv(8):ad
 43115:AUE_JAIL_ATTACH:jail_attach(2):ad
 43116:AUE_SYSCTL_WRITE:sysctl(3):ad
+43117:AUE_IOPERM:linux ioperm:ad
+43118:AUE_READDIR:readdir(3):no
+43119:AUE_IOPL:linux iopl:ad
+43120:AUE_VM86:linux vm86:pc
 #
 # User space system events.
 #