From owner-p4-projects@FreeBSD.ORG Sun Nov 20 12:43:43 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6C1F16A421; Sun, 20 Nov 2005 12:43:42 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9FDCA16A41F for ; Sun, 20 Nov 2005 12:43:42 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74EF143D46 for ; Sun, 20 Nov 2005 12:43:42 +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.1/8.13.1) with ESMTP id jAKChg1R027573 for ; Sun, 20 Nov 2005 12:43:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAKChgv2027570 for perforce@freebsd.org; Sun, 20 Nov 2005 12:43:42 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sun, 20 Nov 2005 12:43:42 GMT Message-Id: <200511201243.jAKChgv2027570@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 86996 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Nov 2005 12:43:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=86996 Change 86996 by rwatson@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