PERFORCE change 21859 for review

[Robert Watson]

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

Change 21859 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message