From owner-p4-projects@FreeBSD.ORG  Fri Jun 20 08:07:16 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2393637B404; Fri, 20 Jun 2003 08:07:16 -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 CCC9A37B401
	for <perforce@freebsd.org>; Fri, 20 Jun 2003 08:07:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF4343F3F
	for <perforce@freebsd.org>; Fri, 20 Jun 2003 08:07:15 -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.6/8.12.6) with ESMTP id h5KF7F0U074741
	for <perforce@freebsd.org>; Fri, 20 Jun 2003 08:07:15 -0700 (PDT)
	(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 h5KF7EHO074728
	for perforce@freebsd.org; Fri, 20 Jun 2003 08:07:14 -0700 (PDT)
Date: Fri, 20 Jun 2003 08:07:14 -0700 (PDT)
Message-Id: <200306201507.h5KF7EHO074728@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 33440 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: Fri, 20 Jun 2003 15:07:16 -0000

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

Change 33440 by rwatson@rwatson_paprika on 2003/06/20 08:06:38

	Add basic MAC options and hook up kern_mac.c to the build
	when required.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/MASTER#2 edit
.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/files#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/MASTER#2 (text+ko) ====

@@ -92,6 +92,9 @@
 options		OLD_VM_CODE	#				# <!newvm>
 options		HW_AST		# Hardware ast support		# <hw_ast>
 options 	HW_FOOTPRINT	# Cache footprint support	# <hw_foot>
+options 	MAC		# Mandatory ACcess Control
+options 	MAC_ALWAYS_LABEL_MBUF
+options 	MAC_DEBUG
 options 	MACH		# Standard Mach features	# <mach>
 options		MACH_ASSERT	# Compile in assertions		# <test>
 options		MACH_COMPAT	# Vendor syscall compatibility  # <mach>

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/conf/files#2 (text+ko) ====

@@ -12,6 +12,7 @@
 OPTIONS/hw_ast				optional hw_ast
 OPTIONS/hw_footprint			optional hw_footprint
 OPTIONS/kernserv			optional kernserv
+OPTIONS/mac				optional mac
 OPTIONS/mach_assert			optional mach_assert
 OPTIONS/mach_compat			optional mach_compat
 OPTIONS/mach_counters			optional mach_counters
@@ -451,6 +452,7 @@
 bsd/kern/kern_fork.c			standard
 bsd/kern/kern_ktrace.c			standard 
 bsd/kern/kern_lock.c			optional cpus
+bsd/kern/kern_mac.c			standard
 bsd/kern/kern_malloc.c			standard
 bsd/kern/kern_mman.c			standard
 bsd/kern/kern_panicinfo.c		standard