diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-09-25 11:53:06 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-09-25 11:53:06 +0000 |
| commit | 8c9fe8b42172bb32e4fc57e7e2aefec5fb88ff96 (patch) | |
| tree | 4652ffa8ca916a125b956e42c3be01ff99dc9f71 /contrib/openbsm | |
| parent | d9989d37d614ed0ea61199525ca512ae1c269fd9 (diff) | |
| download | FreeBSD-src-8c9fe8b42172bb32e4fc57e7e2aefec5fb88ff96.zip FreeBSD-src-8c9fe8b42172bb32e4fc57e7e2aefec5fb88ff96.tar.gz | |
Resolve conflicts from OpenBSM 1.0 alpha 12 import.
Obtained from: TrustedBSD Project
Diffstat (limited to 'contrib/openbsm')
| -rw-r--r-- | contrib/openbsm/etc/audit_control | 3 | ||||
| -rw-r--r-- | 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 faa038c..a711019 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 15a0992..c21f265 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. # |
