From owner-svn-src-stable-10@freebsd.org  Mon Jan  4 16:51:59 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0E575A62956;
 Mon,  4 Jan 2016 16:51:59 +0000 (UTC)
 (envelope-from brueffer@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C1D521A2D;
 Mon,  4 Jan 2016 16:51:58 +0000 (UTC)
 (envelope-from brueffer@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u04GpvZu066101;
 Mon, 4 Jan 2016 16:51:57 GMT (envelope-from brueffer@FreeBSD.org)
Received: (from brueffer@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u04Gpuc5066087;
 Mon, 4 Jan 2016 16:51:56 GMT (envelope-from brueffer@FreeBSD.org)
Message-Id: <201601041651.u04Gpuc5066087@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brueffer set sender to
 brueffer@FreeBSD.org using -f
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Mon, 4 Jan 2016 16:51:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r293163 - in stable/10/sys: bsm security/audit
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2016 16:51:59 -0000

Author: brueffer
Date: Mon Jan  4 16:51:56 2016
New Revision: 293163
URL: https://svnweb.freebsd.org/changeset/base/293163

Log:
  MFH: r292522
  
  Merge from contrib/openbsm to bring the kernel audit bits up to date with OpenBSM 1.2 alpha 4:
  
  - remove $P4$
  - fix a comment

Modified:
  stable/10/sys/bsm/audit.h
  stable/10/sys/bsm/audit_domain.h
  stable/10/sys/bsm/audit_errno.h
  stable/10/sys/bsm/audit_fcntl.h
  stable/10/sys/bsm/audit_internal.h
  stable/10/sys/bsm/audit_kevents.h
  stable/10/sys/bsm/audit_record.h
  stable/10/sys/bsm/audit_socket_type.h
  stable/10/sys/security/audit/bsm_domain.c
  stable/10/sys/security/audit/bsm_errno.c
  stable/10/sys/security/audit/bsm_fcntl.c
  stable/10/sys/security/audit/bsm_socket_type.c
  stable/10/sys/security/audit/bsm_token.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/bsm/audit.h
==============================================================================
--- stable/10/sys/bsm/audit.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * (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
  * $FreeBSD$
  */
 

Modified: stable/10/sys/bsm/audit_domain.h
==============================================================================
--- stable/10/sys/bsm/audit_domain.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_domain.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * 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$
  */
 

Modified: stable/10/sys/bsm/audit_errno.h
==============================================================================
--- stable/10/sys/bsm/audit_errno.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_errno.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * 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$
  */
 

Modified: stable/10/sys/bsm/audit_fcntl.h
==============================================================================
--- stable/10/sys/bsm/audit_fcntl.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_fcntl.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * 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$
  */
 

Modified: stable/10/sys/bsm/audit_internal.h
==============================================================================
--- stable/10/sys/bsm/audit_internal.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_internal.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -30,7 +30,6 @@
  * (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
  * $FreeBSD$
  */
 

Modified: stable/10/sys/bsm/audit_kevents.h
==============================================================================
--- stable/10/sys/bsm/audit_kevents.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_kevents.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * (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#7
  * $FreeBSD$
  */
 
@@ -34,7 +33,7 @@
 #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))

Modified: stable/10/sys/bsm/audit_record.h
==============================================================================
--- stable/10/sys/bsm/audit_record.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_record.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * (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#10
  * $FreeBSD$
  */
 

Modified: stable/10/sys/bsm/audit_socket_type.h
==============================================================================
--- stable/10/sys/bsm/audit_socket_type.h	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/bsm/audit_socket_type.h	Mon Jan  4 16:51:56 2016	(r293163)
@@ -26,7 +26,6 @@
  * 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$
  */
 

Modified: stable/10/sys/security/audit/bsm_domain.c
==============================================================================
--- stable/10/sys/security/audit/bsm_domain.c	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/security/audit/bsm_domain.c	Mon Jan  4 16:51:56 2016	(r293163)
@@ -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/libbsm/bsm_domain.c#3
  */
 
 #include <sys/cdefs.h>

Modified: stable/10/sys/security/audit/bsm_errno.c
==============================================================================
--- stable/10/sys/security/audit/bsm_errno.c	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/security/audit/bsm_errno.c	Mon Jan  4 16:51:56 2016	(r293163)
@@ -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/libbsm/bsm_errno.c#22
  */
 
 #include <sys/cdefs.h>

Modified: stable/10/sys/security/audit/bsm_fcntl.c
==============================================================================
--- stable/10/sys/security/audit/bsm_fcntl.c	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/security/audit/bsm_fcntl.c	Mon Jan  4 16:51:56 2016	(r293163)
@@ -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/libbsm/bsm_fcntl.c#2
  */
 
 #include <sys/cdefs.h>

Modified: stable/10/sys/security/audit/bsm_socket_type.c
==============================================================================
--- stable/10/sys/security/audit/bsm_socket_type.c	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/security/audit/bsm_socket_type.c	Mon Jan  4 16:51:56 2016	(r293163)
@@ -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/libbsm/bsm_socket_type.c#1
  */
 
 #include <sys/cdefs.h>

Modified: stable/10/sys/security/audit/bsm_token.c
==============================================================================
--- stable/10/sys/security/audit/bsm_token.c	Mon Jan  4 16:33:54 2016	(r293162)
+++ stable/10/sys/security/audit/bsm_token.c	Mon Jan  4 16:51:56 2016	(r293163)
@@ -29,8 +29,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/libbsm/bsm_token.c#99
  */
 
 #include <sys/cdefs.h>