From owner-p4-projects  Tue Dec  3  7:44:38 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7298F37B404; Tue,  3 Dec 2002 07:44:36 -0800 (PST)
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 E0E7437B401
	for <perforce@freebsd.org>; Tue,  3 Dec 2002 07:44:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6910043EAF
	for <perforce@freebsd.org>; Tue,  3 Dec 2002 07:44:35 -0800 (PST)
	(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 gB3FePmV056506
	for <perforce@freebsd.org>; Tue, 3 Dec 2002 07:40:25 -0800 (PST)
	(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 gB3FeOa0056503
	for perforce@freebsd.org; Tue, 3 Dec 2002 07:40:24 -0800 (PST)
Date: Tue, 3 Dec 2002 07:40:24 -0800 (PST)
Message-Id: <200212031540.gB3FeOa0056503@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>
Subject: PERFORCE change 21859 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 21859 by rwatson@rwatson_tislabs on 2002/12/03 07:39:31

	Hand merge changes from GENERIC to MAC.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#41 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#41 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first 
 # in NOTES.
 #
-# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.368 2002/10/13 16:29:15 mike Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.369 2002/10/19 16:54:07 rwatson Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -32,7 +32,6 @@
 
 options 	MAC
 options 	MAC_DEBUG
-options 	UFS_ACL
 options 	UFS_EXTATTR
 options 	UFS_EXTATTR_AUTOSTART
 
@@ -40,6 +39,7 @@
 options 	INET6			#IPv6 communications protocols
 options 	FFS			#Berkeley Fast Filesystem
 options 	SOFTUPDATES		#Enable FFS soft updates support
+options 	UFS_ACL			#Support for access control lists
 options 	UFS_DIRHASH		#Improve performance on big directories
 options 	MD_ROOT			#MD is a potential root device
 options 	NFSCLIENT		#Network Filesystem Client

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message