From 0665db84e1c3fd883d01098d2bfa1839b3ec5c0a Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 9 Jul 2002 22:39:22 +0000
Subject: [PATCH] Correct policy file zone validation during [re]start

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@130 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/firewall | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Shorewall/firewall b/Shorewall/firewall
index 33ba3f5ec..accf4e0a4 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -878,8 +878,6 @@ validate_policy()
 	    ;;
 	esac
 
-	echo "	 Policy \"$client $server $policy $loglevel\" Validated"
-
     done < $TMP_DIR/policy
 }
 
@@ -2608,6 +2606,10 @@ initialize_netfilter () {
 
     validate_hosts_file
 
+    echo "Validating Policy file..."
+
+    validate_policy
+
     echo "Determining Hosts in Zones..."
 
     determine_interfaces
@@ -2884,8 +2886,6 @@ apply_policy_rules() {
     #
     while read client server policy loglevel synparams; do
 	expandv client server policy loglevel synparams
-	validate_zone $client
-	validate_zone $server
 
 	chain=${client}2${server}
 
@@ -3117,8 +3117,6 @@ define_firewall() # $1 = Command (Start or Restart)
 
     echo "Processing $policy..."
 
-    strip_file policy $policy
-
     apply_policy_rules
 
     masq=`find_file masq`