PERFORCE change 86996 for review

[Robert Watson]

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

Change 86996 by rwatson at rwatson_zoo on 2005/11/20 12:42:44

	Revert MAC configuration to vendor version from csjp, which is
	much better.  Leave a few extra lines on the end illustrating
	debugging and UFS options (etc) relevant to the MAC development
	branch.

Affected files ...

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

Differences ...

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

@@ -1,10 +1,34 @@
-include		GENERIC
-ident		MAC
+# MAC -- Generic kernel configuration file for FreeBSD/i386 MAC
+#
+# The Mandatory Access Control, or MAC, framework allows administrators to
+# finely control system security by providing for a loadable security pol-
+# icy architecture.
+#
+# For more information see:
+#
+# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mac.html 
+#
+# $FreeBSD: src/sys/i386/conf/MAC,v 1.1 2005/09/18 03:15:35 csjp Exp $
+
+include 	GENERIC
+ident 		MAC
 
 options 	MAC
+
+#options 	MAC_BIBA		# BIBA data integrity policy
+#options 	MAC_BSDEXTENDED		# File system firewall policy
+#options 	MAC_IFOFF		# Network interface silencing policy
+#options 	MAC_LOMAC		# Low-watermark data integrity policy
+#options 	MAC_MLS			# Multi-level confidentiality policy
+#options 	MAC_NONE		# NULL policy
+#options 	MAC_PARTITION		# Process partition policy
+#options 	MAC_PORTACL		# Network port access control policy
+#options 	MAC_SEEOTHERUIDS	# UID visibility policy
+#options 	MAC_STUB		# Stub policy
+#options 	MAC_TEST		# Testing policy for the MAC framework
+
 #options 	MAC_ALWAYS_LABEL_MBUF
 options 	MAC_DEBUG
-options 	MAC_TEST
 #options 	MAC_STATIC
 options 	UFS_EXTATTR
 options 	UFS_EXTATTR_AUTOSTART