aboutsummaryrefslogtreecommitdiff
path: root/sys/bsm
diff options
context:
space:
mode:
authorChristian Brueffer <brueffer@FreeBSD.org>2015-12-09 12:16:21 +0000
committerChristian Brueffer <brueffer@FreeBSD.org>2015-12-09 12:16:21 +0000
commit97aa9e7383bb228ff968ff77101bfa4b68358784 (patch)
treecee869a57e5b8e8ad0ea31df24a68de011a74cee /sys/bsm
parent911ea853e570be4aaaec9076b1240d857525432c (diff)
downloadsrc-97aa9e7383bb228ff968ff77101bfa4b68358784.tar.gz
src-97aa9e7383bb228ff968ff77101bfa4b68358784.zip
Vendor import of OpenBSM 1.2-alpha4.vendor/openbsm/1.2-ALPHA-4
Notes
Notes: svn path=/vendor/openbsm/dist/; revision=292016 svn path=/vendor/openbsm/1.2-ALPHA-4/; revision=292017; tag=vendor/openbsm/1.2-ALPHA-4
Diffstat (limited to 'sys/bsm')
-rw-r--r--sys/bsm/Makefile.am5
-rw-r--r--sys/bsm/audit.h2
-rw-r--r--sys/bsm/audit_domain.h2
-rw-r--r--sys/bsm/audit_errno.h2
-rw-r--r--sys/bsm/audit_fcntl.h2
-rw-r--r--sys/bsm/audit_internal.h2
-rw-r--r--sys/bsm/audit_kevents.h19
-rw-r--r--sys/bsm/audit_record.h2
-rw-r--r--sys/bsm/audit_socket_type.h2
9 files changed, 13 insertions, 25 deletions
diff --git a/sys/bsm/Makefile.am b/sys/bsm/Makefile.am
index 66e79b17abfb..266243d91d46 100644
--- a/sys/bsm/Makefile.am
+++ b/sys/bsm/Makefile.am
@@ -1,8 +1,3 @@
-##
-## $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/Makefile.am#5 $
-##
-
-
if ! USE_NATIVE_INCLUDES
openbsmdir = $(includedir)/bsm
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index bb4a9497b64e..215981301a75 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.h
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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#10 $
*/
#ifndef _BSM_AUDIT_H
diff --git a/sys/bsm/audit_domain.h b/sys/bsm/audit_domain.h
index 3969183292cb..373afa7b4bbc 100644
--- a/sys/bsm/audit_domain.h
+++ b/sys/bsm/audit_domain.h
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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_domain.h#2 $
*/
#ifndef _BSM_AUDIT_DOMAIN_H_
diff --git a/sys/bsm/audit_errno.h b/sys/bsm/audit_errno.h
index abdaff8bf4c2..1c467eedc58c 100644
--- a/sys/bsm/audit_errno.h
+++ b/sys/bsm/audit_errno.h
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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_errno.h#7 $
*/
#ifndef _BSM_AUDIT_ERRNO_H_
diff --git a/sys/bsm/audit_fcntl.h b/sys/bsm/audit_fcntl.h
index 1398b2f0ddde..708991ebd89f 100644
--- a/sys/bsm/audit_fcntl.h
+++ b/sys/bsm/audit_fcntl.h
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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_fcntl.h#2 $
*/
#ifndef _BSM_AUDIT_FCNTL_H_
diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h
index 21176c8cf26c..77d3dbe07cd1 100644
--- a/sys/bsm/audit_internal.h
+++ b/sys/bsm/audit_internal.h
@@ -29,8 +29,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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_internal.h#6 $
*/
#ifndef _AUDIT_INTERNAL_H
diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h
index 94e42ab2eb83..3f92b7195647 100644
--- a/sys/bsm/audit_kevents.h
+++ b/sys/bsm/audit_kevents.h
@@ -25,18 +25,16 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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_kevents.h#10 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
#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.
@@ -587,7 +585,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. */
@@ -602,6 +601,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
diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h
index 2a49cdc6ec56..bd87fe8ab70d 100644
--- a/sys/bsm/audit_record.h
+++ b/sys/bsm/audit_record.h
@@ -25,8 +25,6 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (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_record.h#12 $
*/
#ifndef _BSM_AUDIT_RECORD_H_
diff --git a/sys/bsm/audit_socket_type.h b/sys/bsm/audit_socket_type.h
index 85f6aef7ab1c..660ef0fe79bf 100644
--- a/sys/bsm/audit_socket_type.h
+++ b/sys/bsm/audit_socket_type.h
@@ -25,8 +25,6 @@
* STRICT LIABILITY, OR TORT (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_socket_type.h#1 $
*/
#ifndef _BSM_AUDIT_SOCKET_TYPE_H_