From owner-p4-projects@FreeBSD.ORG  Fri Dec  1 13:01:05 2006
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 D6B5D16A47B; Fri,  1 Dec 2006 13:01:04 +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 B578016A40F
	for <perforce@freebsd.org>; Fri,  1 Dec 2006 13:01:04 +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 6641E43CAB
	for <perforce@freebsd.org>; Fri,  1 Dec 2006 13:00:49 +0000 (GMT)
	(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.6/8.13.6) with ESMTP id kB1D132J076989
	for <perforce@freebsd.org>; Fri, 1 Dec 2006 13:01:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB1D13Ya076986
	for perforce@freebsd.org; Fri, 1 Dec 2006 13:01:03 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Fri, 1 Dec 2006 13:01:03 GMT
Message-Id: <200612011301.kB1D13Ya076986@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 110797 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: Fri, 01 Dec 2006 13:01:05 -0000

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

Change 110797 by rwatson@rwatson_zoo on 2006/12/01 13:00:46

	Revert additional branch-local changes in priv branch.

Affected files ...

.. //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#4 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/jail.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mac.h#5 integrate
.. //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#8 integrate

Differences ...

==== //depot/projects/trustedbsd/priv/sys/security/mac/mac_priv.c#4 (text+ko) ====

@@ -26,7 +26,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/security/mac/mac_priv.c,v 1.1 2006/11/06 13:37:18 rwatson Exp $
  */
 
 /*

==== //depot/projects/trustedbsd/priv/sys/sys/jail.h#5 (text+ko) ====

@@ -40,7 +40,6 @@
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
 #include <sys/_task.h>
-#include <sys/priv.h>
 
 #define JAIL_MAX	999999
 

==== //depot/projects/trustedbsd/priv/sys/sys/mac.h#5 (text+ko) ====

@@ -47,6 +47,8 @@
 #ifndef _SYS_MAC_H_
 #define	_SYS_MAC_H_
 
+#include <sys/_label.h>
+
 #ifndef _POSIX_MAC
 #define	_POSIX_MAC
 #endif

==== //depot/projects/trustedbsd/priv/sys/sys/mac_policy.h#8 (text+ko) ====

@@ -55,7 +55,6 @@
  * Operations are sorted first by general class of operation, then
  * alphabetically.
  */
-#include <sys/_label.h>
 #include <sys/acl.h>	/* XXX acl_type_t */
 
 struct acl;