PERFORCE change 107771 for review

[Todd Miller]

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

Change 107771 by millert at millert_macbook on 2006/10/12 19:28:35

	Always load migscs data if it is available.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/load_policy/load_policy.c#3 (text+ko) ====

@@ -19,14 +19,14 @@
 
 void usage(char *progname)
 {
-	fprintf(stderr, _("usage:  %s [-m migscs_file] [-bq]\n"), progname);
+	fprintf(stderr, _("usage:  %s [-bq]\n"), progname);
 	exit(1);
 }
 
 int main(int argc, char **argv)
 {
 	int ret, opt, quiet = 0, preservebools = 1, nargs;
-	char *migscs = NULL;
+	char *migscs;
 
 #ifdef USE_NLS
 	setlocale(LC_ALL, "");
@@ -34,14 +34,11 @@
 	textdomain(PACKAGE);
 #endif
 
-	while ((opt = getopt(argc, argv, "bmq")) > 0) {
+	while ((opt = getopt(argc, argv, "bq")) > 0) {
 		switch (opt) {
 		case 'b':
 			preservebools = 0;
 			break;
-		case 'm':
-			migscs = optarg;
-			break;	
 		case 'q':
 			quiet = 1;
 			sepol_debug(0);
@@ -65,6 +62,7 @@
 			argv[0], argv[optind++]);
 	}
 	
+	migscs = selinux_migscs_path();
 	if (migscs != NULL) {
 		ret = selinux_load_migscs(migscs);
 		if (ret) {