Tested on Fedora 7 (32-bit).

Corrected -v and -explain output when reloading MTA.


git-svn-id: https://svn.microneil.com/svn/SNFUtility/trunk@30 aa37657e-1934-4a5f-aa6d-2d8eab27ff7c

SNFMilterConfig/PostfixIntegrate.cpp

@@ -137,13 +137,10 @@ PostfixIntegrate::Integrate(FileBackup *SaveFile) {
 
     OutputVerboseEnd();
 
-    if (!Explain()) {
-
-	if (MtaIsRunningDetected()) {
-
-	    ReloadMta();
+    if (!ReloadMta()) {
 
-	}
+        std::cerr << "Unable to reload the postfix configuration.  Please run "
+		  << "'postfix reload' for the integration with SNFMilter to take effect.";
 
     }
 
@@ -259,13 +256,10 @@ PostfixIntegrate::Unintegrate(FileBackup *SaveFile) {
 
     OutputVerboseEnd();
 
-    if (!Explain()) {
-
-	if (MtaIsRunningDetected()) {
+    if (!ReloadMta()) {
 
-	    ReloadMta();
-
-	}
+        std::cerr << "Unable to reload the postfix configuration.  Please run "
+		  << "'postfix reload' for the integration with SNFMilter to take effect.";
 
     }
 
@@ -299,6 +293,12 @@ PostfixIntegrate::MtaIsRunningDetected() {
 bool
 PostfixIntegrate::ReloadMta() {
 
+    if (!MtaIsRunningDetected()) {
+
+        return true;
+
+    }
+
     if (Verbose()) {
 
 	std::cout << "Reloading postfix...\n";

SNFMilterConfig/SNFMilterConfigTests.txt

@@ -492,9 +492,9 @@ POSTFIX-06: Configure as for POSTFIX-04, and do the following:
 
   Result:  Pass.
 
-POSTFIX-07:  Repeat POSTFIX-01 thru POSTFIX-07 on Fedora.
+POSTFIX-07:  Repeat POSTFIX-01 thru POSTFIX-06 on Fedora.
 
-  Result:
+  Result:  Pass.
 
 POSTFIX-08:  Repeat POSTFIX-01 thru POSTFIX-07 on OpenSuse.