From owner-p4-projects@FreeBSD.ORG  Mon May  3 15:51:13 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BB33F16A4DA; Mon,  3 May 2004 15:51:12 -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 7454E16A4D5
	for <perforce@freebsd.org>; Mon,  3 May 2004 15:51:12 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5B98343D45
	for <perforce@freebsd.org>; Mon,  3 May 2004 15:51:12 -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.10/8.12.10) with ESMTP id i43MpCGe055104
	for <perforce@freebsd.org>; Mon, 3 May 2004 15:51:12 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i43MpBdf055101
	for perforce@freebsd.org; Mon, 3 May 2004 15:51:11 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 3 May 2004 15:51:11 -0700 (PDT)
Message-Id: <200405032251.i43MpBdf055101@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 52175 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: Mon, 03 May 2004 22:51:14 -0000

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

Change 52175 by rwatson@rwatson_tislabs on 2004/05/03 15:51:00

	MAC_STATIC and id(1) -M merged.

Affected files ...

.. //depot/projects/trustedbsd/mac/MERGE#6 edit

Differences ...

==== //depot/projects/trustedbsd/mac/MERGE#6 (text+ko) ====

@@ -12,10 +12,6 @@
 
 	ipcs(1) label support.
 
-	MAC_STATIC to optimize performance by removing locking that
-	  supports dynamic policy changes, limiting the system to
-	  statically loaded policies.
-
 	Removal of redundant suser check in kern_xxx.c
 
 	NFS client credential fixes.
@@ -24,8 +20,6 @@
 	  in netinet.  This helps to avoid the need for socket label
 	  locking in a number of important cases.
 
-	id(1) label support.
-
 Consider to merge TODO:
 
 	p_canwait().