summaryrefslogtreecommitdiff
path: root/usr/src/lib
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-10-29 11:58:27 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-10-29 11:58:27 +0000
commitd84c48b412a8b9237a5f5ebbd017bc17997a127d (patch)
tree7225df9d237be850d97d97c40d14e978f7fcbbba /usr/src/lib
parent1080b4559e1fe43e7e4b10878cad18dc74b32b00 (diff)
parentfdfb6e575f06007c35263fbcdc483157ef62d712 (diff)
downloadillumos-joyent-d84c48b412a8b9237a5f5ebbd017bc17997a127d.tar.gz
[illumos-gate merge]
commit fdfb6e575f06007c35263fbcdc483157ef62d712 11838 secflag tests are racy commit 3dae5456c609a0bdfeffc8d1c0dc436db6ab3436 11837 tests/pf_key/acquire-compare is racy commit e8c8a1a444941de591eb788ba3d8fccad81ad51c 10585 Non-standard definition of $PAGER in /etc/profile commit c2e9ac5c28eb1a9d5839d914b821e44a7dfdc767 11881 loader: zfs_fmtdev can crash when pool discovery did fail and we have no spa commit 87f5f83847407477d2c5767304c83c65a73a8ff9 11869 Fix disable option summary in svcadm(1m) commit 5a120e272991505eb171d0469f79d937cced483a 11856 chown can trigger vmdump when running recentish zfs commit 90ffcda9b1f712011f19aba3612b22dcce407013 11669 terminfo could know about rxvt-unicode commit b5c366f4aa9361f18dccd4d00380b3e2e36be40c 11037 SMB File access audit logging (reserve IDs)
Diffstat (limited to 'usr/src/lib')
-rw-r--r--usr/src/lib/libbsm/audit_class.txt5
-rw-r--r--usr/src/lib/libbsm/audit_event.txt2
2 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/lib/libbsm/audit_class.txt b/usr/src/lib/libbsm/audit_class.txt
index ae51e5fb53..30b0d84716 100644
--- a/usr/src/lib/libbsm/audit_class.txt
+++ b/usr/src/lib/libbsm/audit_class.txt
@@ -2,6 +2,8 @@
# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
+# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
+#
# CDDL HEADER START
#
# The contents of this file are subject to the terms of the
@@ -21,8 +23,6 @@
#
# CDDL HEADER END
#
-# ident "%Z%%M% %I% %E% SMI"
-#
# User Level Class Masks
#
# Developers: If you change this file you must also edit audit.h.
@@ -66,6 +66,7 @@
0x00800000:xc:X - object create/destroy
0x01000000:xs:X - operations that always silently fail, if bad
0x01c00000:xx:X - all X events (meta-class)
+0x02000000:sa:SACL-based File Access Auditing
0x20000000:io:ioctl
0x40000000:ex:exec
0x80000000:ot:other
diff --git a/usr/src/lib/libbsm/audit_event.txt b/usr/src/lib/libbsm/audit_event.txt
index 242aab3703..393d98ab62 100644
--- a/usr/src/lib/libbsm/audit_event.txt
+++ b/usr/src/lib/libbsm/audit_event.txt
@@ -1,5 +1,6 @@
#
# Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2018 Nexenta Systems, Inc. All rights reserved.
#
#
# CDDL HEADER START
@@ -361,6 +362,7 @@
310:AUE_AUDITON_GETAMASK:auditon(2) - get default user preselection mask:aa
311:AUE_AUDITON_SETAMASK:auditon(2) - set default user preselection mask:as
312:AUE_PSECFLAGS:psecflags(2) - set process security flags:pm
+313:AUE_SACL:SACL-based File Access Auditing:sa
#
# user level audit events
# 2048 - 6143 Reserved