From owner-p4-projects@FreeBSD.ORG  Thu Aug 21 09:16:59 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F333516A4C1; Thu, 21 Aug 2003 09:16:58 -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 C01DE16A4BF
	for <perforce@freebsd.org>; Thu, 21 Aug 2003 09:16:58 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A7CB743FF5
	for <perforce@freebsd.org>; Thu, 21 Aug 2003 09:16:57 -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 h7LGGv0U087623
	for <perforce@freebsd.org>; Thu, 21 Aug 2003 09:16:57 -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 h7LGGv93087617
	for perforce@freebsd.org; Thu, 21 Aug 2003 09:16:57 -0700 (PDT)
Date: Thu, 21 Aug 2003 09:16:57 -0700 (PDT)
Message-Id: <200308211616.h7LGGv93087617@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 36590 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 16:16:59 -0000

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

Change 36590 by rwatson@rwatson_tislabs on 2003/08/21 09:16:20

	Integrate TrustedBSD MAC branch from base branch: loop back two
	more files relating to deletextattr and listextattr; also loop
	back the repo-copy of mac_none to mac_stub.  Curious to see how
	well that works...

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/modules/mac_stub/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_stub/mac_stub.c#3 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#240 integrate
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#193 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/sys/modules/mac_stub/Makefile#2 (text+ko) ====


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


==== //depot/projects/trustedbsd/mac/sys/sys/mac.h#240 (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/sys/mac.h,v 1.40 2003/04/18 19:57:37 rwatson Exp $
+ * $FreeBSD: src/sys/sys/mac.h,v 1.41 2003/08/21 13:52:59 rwatson Exp $
  */
 /*
  * Userland/kernel interface for Mandatory Access Control.

==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#193 (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/sys/mac_policy.h,v 1.41 2003/06/23 01:26:33 rwatson Exp $
+ * $FreeBSD: src/sys/sys/mac_policy.h,v 1.42 2003/08/21 13:52:59 rwatson Exp $
  */
 /*
  * Kernel interface for MAC policy modules.