[Midnightbsd-cvs] src [10170] trunk/sys/bsm: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Jun 1 18:52:04 EDT 2018
Revision: 10170
http://svnweb.midnightbsd.org/src/?rev=10170
Author: laffer1
Date: 2018-06-01 18:52:03 -0400 (Fri, 01 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/sys/bsm/audit.h
trunk/sys/bsm/audit_domain.h
trunk/sys/bsm/audit_errno.h
trunk/sys/bsm/audit_fcntl.h
trunk/sys/bsm/audit_internal.h
trunk/sys/bsm/audit_kevents.h
trunk/sys/bsm/audit_record.h
trunk/sys/bsm/audit_socket_type.h
Modified: trunk/sys/bsm/audit.h
===================================================================
--- trunk/sys/bsm/audit.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,6 +1,6 @@
-/* $MidnightBSD: src/sys/bsm/audit.h,v 1.5 2012/03/31 03:08:56 laffer1 Exp $ */
-/*
- * Copyright (c) 2005 Apple Inc.
+/* $MidnightBSD$ */
+/*-
+ * Copyright (c) 2005-2009 Apple Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,9 +27,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/audit3/sys/bsm/audit.h#40
- * $FreeBSD: src/sys/bsm/audit.h,v 1.9.2.1 2007/11/04 12:50:40 rwatson Exp $
- * $MidnightBSD: src/sys/bsm/audit.h,v 1.5 2012/03/31 03:08:56 laffer1 Exp $
+ * $FreeBSD: stable/10/sys/bsm/audit.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_H
Modified: trunk/sys/bsm/audit_domain.h
===================================================================
--- trunk/sys/bsm/audit_domain.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_domain.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
@@ -26,8 +27,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#2
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_domain.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_DOMAIN_H_
Modified: trunk/sys/bsm/audit_errno.h
===================================================================
--- trunk/sys/bsm/audit_errno.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_errno.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
@@ -26,8 +27,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_errno.h#7
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_errno.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_ERRNO_H_
Modified: trunk/sys/bsm/audit_fcntl.h
===================================================================
--- trunk/sys/bsm/audit_fcntl.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_fcntl.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2009 Apple Inc.
* All rights reserved.
@@ -26,8 +27,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_fcntl.h#2
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_fcntl.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_FCNTL_H_
Modified: trunk/sys/bsm/audit_internal.h
===================================================================
--- trunk/sys/bsm/audit_internal.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_internal.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,6 +1,6 @@
/* $MidnightBSD$ */
-/*
- * Copyright (c) 2005 Apple Inc.
+/*-
+ * Copyright (c) 2005-2008 Apple Inc.
* Copyright (c) 2005 SPARTA, Inc.
* All rights reserved.
*
@@ -31,9 +31,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/audit3/sys/bsm/audit_internal.h#18
- * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.8 2007/07/22 12:28:12 rwatson Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_internal.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _AUDIT_INTERNAL_H
Modified: trunk/sys/bsm/audit_kevents.h
===================================================================
--- trunk/sys/bsm/audit_kevents.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_kevents.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,6 +1,6 @@
/* $MidnightBSD$ */
-/*
- * Copyright (c) 2005 Apple Inc.
+/*-
+ * Copyright (c) 2005-2009 Apple Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,9 +27,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/audit3/sys/bsm/audit_kevents.h#34
- * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.12 2007/07/22 12:28:12 rwatson Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_kevents.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -36,10 +34,10 @@
#define _BSM_AUDIT_KEVENTS_H_
/*
- * The reserved event numbers for kernel events are 1...2047 and 43001..44900.
+ * The reserved event numbers for kernel events are 1...2047 and 43001..44999.
*/
-#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \
- ((e) > 43000 && (e) < 45000))
+#define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \
+ ((e) > 43000 && (e) < 45000))
/*
* Values marked as AUE_NULL are not required to be audited as per CAPP.
@@ -590,7 +588,8 @@
#define AUE_OPENAT 43184 /* FreeBSD. */
#define AUE_POSIX_OPENPT 43185 /* FreeBSD. */
#define AUE_CAP_NEW 43186 /* TrustedBSD. */
-#define AUE_CAP_GETRIGHTS 43187 /* TrustedBSD. */
+#define AUE_CAP_RIGHTS_GET 43187 /* TrustedBSD. */
+#define AUE_CAP_GETRIGHTS AUE_CAP_RIGHTS_GET
#define AUE_CAP_ENTER 43188 /* TrustedBSD. */
#define AUE_CAP_GETMODE 43189 /* TrustedBSD. */
#define AUE_POSIX_SPAWN 43190 /* Darwin. */
@@ -605,6 +604,14 @@
#define AUE_PDGETPID 43199 /* FreeBSD. */
#define AUE_PDWAIT 43200 /* FreeBSD. */
#define AUE_WAIT6 43201 /* FreeBSD. */
+#define AUE_CAP_RIGHTS_LIMIT 43202 /* TrustedBSD. */
+#define AUE_CAP_IOCTLS_LIMIT 43203 /* TrustedBSD. */
+#define AUE_CAP_IOCTLS_GET 43204 /* TrustedBSD. */
+#define AUE_CAP_FCNTLS_LIMIT 43205 /* TrustedBSD. */
+#define AUE_CAP_FCNTLS_GET 43206 /* TrustedBSD. */
+#define AUE_BINDAT 43207 /* TrustedBSD. */
+#define AUE_CONNECTAT 43208 /* TrustedBSD. */
+#define AUE_CHFLAGSAT 43209 /* FreeBSD-specific. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the
Modified: trunk/sys/bsm/audit_record.h
===================================================================
--- trunk/sys/bsm/audit_record.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_record.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,6 +1,6 @@
/* $MidnightBSD$ */
-/*
- * Copyright (c) 2005 Apple Inc.
+/*-
+ * Copyright (c) 2005-2009 Apple Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,9 +27,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/audit3/sys/bsm/audit_record.h#26
- * $FreeBSD: src/sys/bsm/audit_record.h,v 1.10 2007/07/22 12:28:13 rwatson Exp $
- * $MidnightBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_record.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_RECORD_H_
@@ -36,6 +34,7 @@
#define _BSM_AUDIT_RECORD_H_
#include <sys/time.h> /* struct timeval */
+#include <sys/caprights.h> /* cap_rights_t */
/*
* Token type identifiers.
@@ -128,6 +127,8 @@
#define AUT_SOCKINET128 0x81 /* XXX */
#define AUT_SOCKUNIX 0x82 /* XXX */
+#define AUT_RIGHTS 0x83
+
/* print values for the arbitrary token */
#define AUP_BINARY 0
#define AUP_OCTAL 1
@@ -250,6 +251,7 @@
au_tid_addr_t *tid);
token_t *au_to_process64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
+token_t *au_to_rights(cap_rights_t *rightsp);
token_t *au_to_return(char status, uint32_t ret);
token_t *au_to_return32(char status, uint32_t ret);
token_t *au_to_return64(char status, uint64_t ret);
Modified: trunk/sys/bsm/audit_socket_type.h
===================================================================
--- trunk/sys/bsm/audit_socket_type.h 2018-06-01 22:51:18 UTC (rev 10169)
+++ trunk/sys/bsm/audit_socket_type.h 2018-06-01 22:52:03 UTC (rev 10170)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (c) 2008 Apple Inc.
* All rights reserved.
@@ -26,8 +27,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_socket_type.h#1
- * $FreeBSD$
+ * $FreeBSD: stable/10/sys/bsm/audit_socket_type.h 293163 2016-01-04 16:51:56Z brueffer $
*/
#ifndef _BSM_AUDIT_SOCKET_TYPE_H_
More information about the Midnightbsd-cvs
mailing list