From owner-p4-projects@FreeBSD.ORG  Thu Aug 21 10:45:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4E78416A4C1; Thu, 21 Aug 2003 10:45:57 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DE03816A4BF
	for <perforce@freebsd.org>; Thu, 21 Aug 2003 10:45:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 76A7D43FE5
	for <perforce@freebsd.org>; Thu, 21 Aug 2003 10:45:56 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7LHju0U011313
	for <perforce@freebsd.org>; Thu, 21 Aug 2003 10:45:56 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7LHjtxh011310
	for perforce@freebsd.org; Thu, 21 Aug 2003 10:45:55 -0700 (PDT)
Date: Thu, 21 Aug 2003 10:45:55 -0700 (PDT)
Message-Id: <200308211745.h7LHjtxh011310@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>
Subject: PERFORCE change 36606 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Thu, 21 Aug 2003 17:45:58 -0000

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

Change 36606 by rwatson@rwatson_tislabs on 2003/08/21 10:45:11

	Loop-back integrate of mac_stub and mac_test merge into FreeBSD
	base tree: label life cycle assertions, new stub functions for 
	merged entry points, new test functions for merged entry points.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#111 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.31 2003/08/21 16:22:52 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_stub/mac_stub.c,v 1.32 2003/08/21 17:05:36 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/mac/sys/security/mac_test/mac_test.c#111 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.29 2003/07/05 01:24:36 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_test/mac_test.c,v 1.30 2003/08/21 17:28:45 rwatson Exp $
  */
 
 /*