[Selinux-commits] SF.net SVN: selinux: [2121] trunk/policycoreutils

[<kma...@us...>]

Revision: 2121
          http://svn.sourceforge.net/selinux/?rev=2121&view=rev
Author:   kmacmillan
Date:     2007-01-03 08:11:29 -0800 (Wed, 03 Jan 2007)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: Patch to load_policy to enforce quiet option
Date: Wed, 29 Nov 2006 17:16:30 -0500

Acked-by: Karl MacMillan <kma...@me...>

Modified Paths:
--------------
    trunk/policycoreutils/ChangeLog
    trunk/policycoreutils/VERSION
    trunk/policycoreutils/load_policy/load_policy.c

Modified: trunk/policycoreutils/ChangeLog
===================================================================
--- trunk/policycoreutils/ChangeLog	2006-12-01 14:11:55 UTC (rev 2120)
+++ trunk/policycoreutils/ChangeLog	2007-01-03 16:11:29 UTC (rev 2121)
@@ -1,3 +1,6 @@
+1.33.7 2007-1-3
+	* Patch from Dan Walsh to correctly suppress warnings in load_policy.
+	
 1.33.6 2006-11-29
 	* Patch from Dan Walsh to add an pam_acct_msg call to run_init
 	* Patch from Dan Walsh to fix error code returns in newrole

Modified: trunk/policycoreutils/VERSION
===================================================================
--- trunk/policycoreutils/VERSION	2006-12-01 14:11:55 UTC (rev 2120)
+++ trunk/policycoreutils/VERSION	2007-01-03 16:11:29 UTC (rev 2121)
@@ -1 +1 @@
-1.33.6
+1.33.7

Modified: trunk/policycoreutils/load_policy/load_policy.c
===================================================================
--- trunk/policycoreutils/load_policy/load_policy.c	2006-12-01 14:11:55 UTC (rev 2120)
+++ trunk/policycoreutils/load_policy/load_policy.c	2007-01-03 16:11:29 UTC (rev 2121)
@@ -50,12 +50,12 @@
 	nargs = argc - optind;
 	if (nargs > 2)
 		usage(argv[0]);
-	if (nargs >= 1) {
-		fprintf(stderr,
-			"%s:  Warning!  Policy file argument (%s) is no longer supported, installed policy is always loaded.  Continuing...\n",
-			argv[0], argv[optind++]);
+	if (nargs >= 1 && !quiet) {
+			fprintf(stderr,
+				"%s:  Warning!  Policy file argument (%s) is no longer supported, installed policy is always loaded.  Continuing...\n",
+				argv[0], argv[optind++]);
 	}
-	if (nargs == 2) {
+	if (nargs == 2 && ! quiet) {
 		fprintf(stderr,
 			"%s:  Warning!  Boolean file argument (%s) is no longer supported, installed booleans file is always used.  Continuing...\n",
 			argv[0], argv[optind++]);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.