Fix 'shorewall add'

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1755 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall2/changelog.txt

@@ -138,3 +138,5 @@ Changes since 2.0.3
 66) Update bogons file.
 
 67) Add a rule for NNTPS to action.AllowNNTP
+
+68) Fix "shorewall add"

Shorewall2/firewall

@@ -1749,6 +1749,7 @@ setup_tunnels() # $1 = name of tunnels file
 # Process the ipsec file
 #
 setup_ipsec() {
+    local zone
     #
     # Add a --set-mss rule to the passed chain
     #
@@ -6642,18 +6643,21 @@ add_to_zone() # $1 = <interface>[:<hosts>] $2 = zone
     #
     validate_interfaces_file
     #
+    # Validate IPSec File
+    #
+    f=$(find_file ipsec)
+
+    if [ -f $f ]; then
+	progress_message "Processing $f..."
+	setup_ipsec $f
+    fi
+    #
     # Validate Zone
     #
     zone=$2
 
     validate_zone $zone || startup_error "Unknown zone: $zone"
 
-    f=$(find_file ipsec)
-    if [ -f $f ]; then
-	progress_message "Processing $f..."
-	setup_ipsec $f
-    fi
-
     [ "$zone" = $FW ] && startup_error "Can't add $1 to firewall zone"
 
     eval is_ipsec=\$${zone}_is_ipsec

Shorewall2/releasenotes.txt

@@ -125,6 +125,9 @@ Problems corrected since 2.2.0 Beta 3.
 2) A typo in /etc/shorewall/rules has been corrected.
 
 3) The bogons file has been updated.
+
+4) The "shorewall add" command previously reported success but did 
+   nothing -- now it works.
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0 to Shorewall 2.1: