From 1447b53d848eb7af272d782353b9f3b40fa9fc39 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 14 Nov 2006 18:24:09 +0000
Subject: [PATCH] Bring forward progress message fix

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4874 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/lib.config       | 8 ++++----
 Shorewall/lib.dynamiczones | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Shorewall/lib.config b/Shorewall/lib.config
index 6bd01cb9f..decc6a8aa 100644
--- a/Shorewall/lib.config
+++ b/Shorewall/lib.config
@@ -492,16 +492,16 @@ setup_ipsec() {
     case $IPSECFILE in
 	zones)
 	    f=zones
-	    progress_message2 "$DOING IPSEC..."
-	    [ -n "$IPSEC_ZONES" ] && save_progress_message "Setting up IPSEC management..."
+	    progress_message "$DOING IPSEC..."
+	    [ $PROGRAM = compiler && -n "$IPSEC_ZONES" ] && save_progress_message "Setting up IPSEC management..."
 	    ;;
 	*)
 	    f=$IPSECFILE
 	    strip_file $f
 	    using_ipsec=Yes
 	    if [ -s ${TMP_DIR}/$f ]; then
-		progress_message2 "$DOING $f..."
-		save_progress_message "Setting up IPSEC management..."
+		progress_message "$DOING $f..."
+		[ $PROGRAM = compiler ] && save_progress_message "Setting up IPSEC management..."
 	    fi
 	    ;;
     esac
diff --git a/Shorewall/lib.dynamiczones b/Shorewall/lib.dynamiczones
index 1017de4c7..ec13ead60 100644
--- a/Shorewall/lib.dynamiczones
+++ b/Shorewall/lib.dynamiczones
@@ -50,6 +50,8 @@ add_to_zone() # $1...${n-1} = <interface>[:<hosts>] $n = zone
 	fi
     }
 
+    DOING=Processing
+    DONE=Processed
     #
     # Load $zones
     #
@@ -229,6 +231,8 @@ delete_from_zone() # $1 = <interface>[:<hosts>] $2 = zone
     local dhcp_interfaces blacklist_interfaces maclist_interfaces tcpflags_interfaces
     local rulenum source_chain dest_hosts iface hosts hostlist=
 
+    DOING=Processing
+    DONE=Processed
     #
     # Load $zones
     #