Resolve conflicts from OpenBSM 1.0 alpha 12 import.

Obtained from:	TrustedBSD Project
This commit is contained in:
rwatson 2006-09-25 11:53:06 +00:00
parent d9989d37d6
commit 8c9fe8b421
2 changed files with 7 additions and 2 deletions

View File

@ -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

View File

@ -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.
#