From owner-trustedbsd-cvs@FreeBSD.ORG  Thu Oct 12 19:29:25 2006
Return-Path: <owner-trustedbsd-cvs@FreeBSD.ORG>
X-Original-To: trustedbsd-cvs@freebsd.org
Delivered-To: trustedbsd-cvs@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0243B16A4C8
	for <trustedbsd-cvs@freebsd.org>; Thu, 12 Oct 2006 19:29:25 +0000 (UTC)
	(envelope-from owner-perforce@freebsd.org)
Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EF5B543D94
	for <trustedbsd-cvs@freebsd.org>; Thu, 12 Oct 2006 19:29:06 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119])
	by cyrus.watson.org (Postfix) with ESMTP id ECEA946D33
	for <trustedbsd-cvs@trustedbsd.org>;
	Thu, 12 Oct 2006 15:29:05 -0400 (EDT)
Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18])
	by mx2.freebsd.org (Postfix) with ESMTP id 0E8405702A;
	Thu, 12 Oct 2006 19:29:03 +0000 (GMT)
	(envelope-from owner-perforce@freebsd.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 02A7C16A47E; Thu, 12 Oct 2006 19:29:03 +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 BA93416A47B
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 19:29:02 +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 42C6E43D81
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 19:28:57 +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 k9CJSv2f064465
	for <perforce@freebsd.org>; Thu, 12 Oct 2006 19:28:57 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k9CJSvmM064459
	for perforce@freebsd.org; Thu, 12 Oct 2006 19:28:57 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 12 Oct 2006 19:28:57 GMT
Message-Id: <200610121928.k9CJSvmM064459@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 107771 for review
X-BeenThere: trustedbsd-cvs@FreeBSD.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: TrustedBSD CVS and Perforce commit message list
	<trustedbsd-cvs.FreeBSD.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>, 
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/trustedbsd-cvs>
List-Post: <mailto:trustedbsd-cvs@FreeBSD.org>
List-Help: <mailto:trustedbsd-cvs-request@FreeBSD.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/trustedbsd-cvs>,
	<mailto:trustedbsd-cvs-request@FreeBSD.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Oct 2006 19:29:25 -0000

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

Change 107771 by millert@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) {