aboutsummaryrefslogtreecommitdiff
path: root/sys/bsm
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2009-04-19 16:17:13 +0000
committerRobert Watson <rwatson@FreeBSD.org>2009-04-19 16:17:13 +0000
commitc0020399a650364d0134f79f3fa319f84064372d (patch)
tree23231275c989b2a559134953a8963fe87175a61e /sys/bsm
parent4df4e33572998a0342707718ac8796ac3d21e33c (diff)
parenta751bb747008d2d65523ad2bb7693437b6a3d185 (diff)
downloadsrc-c0020399a650364d0134f79f3fa319f84064372d.tar.gz
src-c0020399a650364d0134f79f3fa319f84064372d.zip
Merge OpenBSM 1.1 from OpenBSM vendor branch to head.
OpenBSM history for imported revision below for reference. MFC after: 2 weeks Sponsored by: Apple, Inc. Obtained from: TrustedBSD Project OpenBSM 1.1 - Change auditon(2) parameters and data structures to be 32/64-bit architecture independent. Add more information to man page about auditon(2) parameters. - Add wrapper functions for auditon(2) to use legacy commands when the new commands are not supported. - Add default for 'expire-after' in audit_control to expire trail files when the audit directory is more than 10 megabytes ('10M'). - Interface to convert between local and BSM fcntl(2) command values has been added: au_bsm_to_fcntl_cmd(3) and au_fcntl_cmd_to_bsm(3), along with definitions of constants in audit_fcntl.h. - A bug, introduced in OpenBSM 1.1 alpha 4, in which AUT_RETURN32 tokens generated by audit_submit(3) were improperly encoded has been fixed. - Fix example in audit_submit(3) man page. Also, make it clear that we want the audit ID as the argument. - A new audit event class 'aa', for post-login authentication and authorization events, has been added.
Notes
Notes: svn path=/head/; revision=191273
Diffstat (limited to 'sys/bsm')
-rw-r--r--sys/bsm/audit_domain.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/bsm/audit_domain.h b/sys/bsm/audit_domain.h
index 1c839dd848cd..76cd38f93fe0 100644
--- a/sys/bsm/audit_domain.h
+++ b/sys/bsm/audit_domain.h
@@ -26,7 +26,7 @@
* 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_domain.h#1
+ * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_domain.h#2
* $FreeBSD$
*/
@@ -88,7 +88,7 @@
#define BSM_PF_SCLUSTER 514 /* FreeBSD-specific. */
#define BSM_PF_ARP 515 /* FreeBSD-specific. */
#define BSM_PF_BLUETOOTH 516 /* FreeBSD-specific. */
-#define BSM_PF_IEEE80211 517 /* FreeBSD-specific. */
+ /* 517: unallocated. */
#define BSM_PF_AX25 518 /* Linux-specific. */
#define BSM_PF_ROSE 519 /* Linux-specific. */
#define BSM_PF_NETBEUI 520 /* Linux-specific. */