From owner-p4-projects@FreeBSD.ORG  Thu Oct 26 19:21:38 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ABF8E16A416; Thu, 26 Oct 2006 19:21:38 +0000 (UTC)
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 85FF616A412
	for <perforce@freebsd.org>; Thu, 26 Oct 2006 19:21:38 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD98843D66
	for <perforce@freebsd.org>; Thu, 26 Oct 2006 19:21:28 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k9QJLSmo077571
	for <perforce@freebsd.org>; Thu, 26 Oct 2006 19:21:28 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9QJLSO0077568
	for perforce@freebsd.org; Thu, 26 Oct 2006 19:21:28 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 26 Oct 2006 19:21:28 GMT
Message-Id: <200610261921.k9QJLSO0077568@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 108506 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 26 Oct 2006 19:21:38 -0000

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

Change 108506 by millert@millert_macbook on 2006/10/26 19:20:57

	It is no longer necessary for /etc/mac.conf to be present.
	The default is now to use all labels from loaded modules.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/etc/Makefile#2 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/etc/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 include ../../Makeconfig
 
-ETCFILES= mac.conf
+ETCFILES= mac.conf.sample
 INSTALL= install
 
 all:

==== //depot/projects/trustedbsd/sedarwin8/darwin/libmac/mac.c#2 (text+ko) ====

@@ -188,8 +188,13 @@
 	else
 		filename = MAC_CONFFILE;
 	file = fopen(filename, "r");
-	if (file == NULL)
+	if (file == NULL) {
+		mac_add_type("file", "*");
+		mac_add_type("ifnet", "*");
+		mac_add_type("packet", "*");
+		mac_add_type("process", "*");
 		return (0);
+	}
 
 	while (fgets(line, LINE_MAX, file)) {
 		char *arg, *comment, *parse, *statement;