From owner-p4-projects@FreeBSD.ORG  Sun Aug 24 21:26:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E69341065671; Sun, 24 Aug 2008 21:26:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8F8A81065678
	for <perforce@freebsd.org>; Sun, 24 Aug 2008 21:26:08 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 937DD8FC13
	for <perforce@freebsd.org>; Sun, 24 Aug 2008 21:26:08 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7OLQ8oo069363
	for <perforce@freebsd.org>; Sun, 24 Aug 2008 21:26:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7OLQ8Yq069361
	for perforce@freebsd.org; Sun, 24 Aug 2008 21:26:08 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 24 Aug 2008 21:26:08 GMT
Message-Id: <200808242126.m7OLQ8Yq069361@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 148289 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 24 Aug 2008 21:26:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=148289

Change 148289 by rwatson@rwatson_freebsd_capabilities on 2008/08/24 21:26:06

	Merge capability-related system call audit event identifiers from
	OpenBSM.  They will eventually loop back via subversion/the FreeBSD
	vendor branch, but not for a bit, so do it by hand for now.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_event#2 edit
.. //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/contrib/openbsm/etc/audit_event#2 (text) ====

@@ -497,6 +497,10 @@
 43150:AUE_MKNODAT:mknodat(2):fc
 43151:AUE_READLINKAT:readlinkat(2):fr
 43152:AUE_SYMLINKAT:symlinkat(2):fc
+43186:AUE_CAP_NEW:cap_new(2):fm
+43187:AUE_CAP_GETRIGHTS:cap_getrights(2):fm
+43188:AUE_CAP_ENTER:cap_enter(2):pc
+43189:AUE_CAP_GETMODE:cap_getmode(2):pc
 #
 # User space system events.
 #

==== //depot/projects/trustedbsd/capabilities/src/sys/bsm/audit_kevents.h#3 (text) ====

@@ -549,6 +549,10 @@
 #define	AUE_READLINKAT		43151	/* FreeBSD. */
 #define	AUE_SYMLINKAT		43152	/* FreeBSD. */
 #define	AUE_POSIXOPENPT		43153	/* FreeBSD. */
+#define	AUE_CAP_NEW		43186	/* TrustedBSD. */
+#define	AUE_CAP_GETRIGHTS	43187	/* TrustedBSD. */
+#define	AUE_CAP_ENTER		43188	/* TrustedBSD. */
+#define	AUE_CAP_GETMODE		43189	/* TrustedBSD. */
 
 /*
  * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the