From owner-p4-projects@FreeBSD.ORG  Wed May 30 13:42:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EE29F16A46F; Wed, 30 May 2007 13:42:16 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C9E3B16A468
	for <perforce@freebsd.org>; Wed, 30 May 2007 13:42:16 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B337C13C458
	for <perforce@freebsd.org>; Wed, 30 May 2007 13:42:16 +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.13.8/8.13.8) with ESMTP id l4UDgGsV067818
	for <perforce@freebsd.org>; Wed, 30 May 2007 13:42:16 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4UDgGfD067797
	for perforce@freebsd.org; Wed, 30 May 2007 13:42:16 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 30 May 2007 13:42:16 GMT
Message-Id: <200705301342.l4UDgGfD067797@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 120625 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: Wed, 30 May 2007 13:42:17 -0000

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

Change 120625 by rwatson@rwatson_zoo on 2007/05/30 13:41:51

	Integrate TrustedBSD audit3 branch from TrustedBSD base: minor
	kernel audit synchronization.

Affected files ...

.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#24 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#34 integrate
.. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#39 integrate

Differences ...

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit.h#24 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/audit/audit.h,v 1.10 2007/04/13 14:55:19 csjp Exp $
+ * $FreeBSD: src/sys/security/audit/audit.h,v 1.11 2007/05/30 11:41:28 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#34 (text+ko) ====

@@ -30,7 +30,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.12 2007/04/17 12:24:18 rwatson Exp $
+ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.13 2007/05/30 09:48:37 rwatson Exp $
  */
 
 #include <sys/types.h>

==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_syscalls.c#39 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.15 2007/05/30 08:39:16 rwatson Exp $
+ * $FreeBSD: src/sys/security/audit/audit_syscalls.c,v 1.16 2007/05/30 11:41:28 rwatson Exp $
  */
 
 /*