summaryrefslogtreecommitdiffstats
path: root/sys/bsm/audit.h
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-03-02 13:29:18 +0000
committerrwatson <rwatson@FreeBSD.org>2009-03-02 13:29:18 +0000
commitee5318d5431890ccd7baeb15560b4bebe982525b (patch)
treee1a5bcd2b0eca50f696afbc416858fa574e50e8d /sys/bsm/audit.h
parent5cacf7357664a8a200d2ba7bd7b8e820b681cd06 (diff)
downloadFreeBSD-src-ee5318d5431890ccd7baeb15560b4bebe982525b.zip
FreeBSD-src-ee5318d5431890ccd7baeb15560b4bebe982525b.tar.gz
Merge OpenBSM 1.1 beta 1 from OpenBSM vendor branch to head, both
contrib/openbsm (svn merge) and src/sys/{bsm,security/audit} (manual merge). OpenBSM history for imported revision below for reference. MFC after: 1 month Sponsored by: Apple, Inc. Obtained from: TrustedBSD Project OpenBSM 1.1 beta 1 - The filesz parameter in audit_control(5) now accepts suffixes: 'B' for Bytes, 'K' for Kilobytes, 'M' for Megabytes, and 'G' for Gigabytes. For legacy support no suffix defaults to bytes. - Audit trail log expiration support added. It is configured in audit_control(5) with the expire-after parameter. If there is no expire-after parameter in audit_control(5), the default, then the audit trail files are not expired and removed. See audit_control(5) for more information. - Change defaults in audit_control: warn at 5% rather than 20% free for audit partitions, rotate automatically at 2mb, and set the default policy to cnt,argv rather than cnt so that execve(2) arguments are captured if AUE_EXECVE events are audited. These may provide more usable defaults for many users. - Use au_domain_to_bsm(3) and au_socket_type_to_bsm(3) to convert au_to_socket_ex(3) arguments to BSM format. - Fix error encoding AUT_IPC_PERM tokens.
Diffstat (limited to 'sys/bsm/audit.h')
-rw-r--r--sys/bsm/audit.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index 53eeadb..24cc583 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.h
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4
+ * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5
* $FreeBSD$
*/
@@ -66,8 +66,9 @@
#define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */
#define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */
#define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */
-#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */
-#define AUDIT_TRIGGER_MAX 7
+#define AUDIT_TRIGGER_INITIALIZE 7 /* User initialize of auditd. */
+#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 /* User expiration of trails. */
+#define AUDIT_TRIGGER_MAX 8
/*
* The special device filename (FreeBSD).
OpenPOWER on IntegriCloud