From owner-p4-projects  Thu Oct 24  8:24:23 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 665AA37B406; Thu, 24 Oct 2002 08:24:21 -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 DBF4A37B401
	for <perforce@freebsd.org>; Thu, 24 Oct 2002 08:24:20 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5CA9D43E6A
	for <perforce@freebsd.org>; Thu, 24 Oct 2002 08:24:20 -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 g9OFNamV005368
	for <perforce@freebsd.org>; Thu, 24 Oct 2002 08:23:36 -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 g9OFNZXN005365
	for perforce@freebsd.org; Thu, 24 Oct 2002 08:23:35 -0700 (PDT)
Date: Thu, 24 Oct 2002 08:23:35 -0700 (PDT)
Message-Id: <200210241523.g9OFNZXN005365@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 20040 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=20040

Change 20040 by rwatson@rwatson_tislabs on 2002/10/24 08:23:08

	Submerge local diffs left over from baseless integ.

Affected files ...

.. //depot/projects/trustedbsd/mac/etc/mac.conf#8 edit

Differences ...

==== //depot/projects/trustedbsd/mac/etc/mac.conf#8 (text+ko) ====

@@ -1,8 +1,10 @@
 #
+# $FreeBSD: src/etc/mac.conf,v 1.1 2002/10/22 14:38:49 rwatson Exp $
+#
 # TrustedBSD MAC userland policy configuration file.  Kernel modules
 # export label information, and mac.conf indicates to userland
-# applications how they should interpret kernel and user-provided
-# labels.
+# applications what defaults they should use in the absense of any
+# other user-provided information.
 #
 
 #

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