PERFORCE change 108506 for review

[Todd Miller]

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

Change 108506 by millert at 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;