Remove DYNAMIC_ZONES dependency for 'show zones'

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

Shorewall2/changelog.txt

@@ -156,3 +156,5 @@ Changes since 2.0.3
 75) Correct bridge handling in "shorewall add" and "shorewall delete"
 
 76) Add "shorewall show zones"
+
+77) Remove dependency of "show zones" on dynamic zones.

Shorewall2/firewall

@@ -6296,8 +6296,9 @@ activate_rules()
 
 	[ -n "$complex" ] && frwd_chain=${zone}_frwd
 
+	echo $zone $source_hosts >> ${STATEDIR}/zones
+	
 	if [ -n "$DYNAMIC_ZONES" ]; then
-	    echo $zone $source_hosts >> ${STATEDIR}/zones
 	    echo "$FW $zone $chain1" >> ${STATEDIR}/chains
 	    echo "$zone $FW $chain2" >> ${STATEDIR}/chains
 	fi

Shorewall2/help

@@ -238,8 +238,7 @@ show)
     shorewall show tc - displays information about the traffic
 	control/shaping configuration.
 
-    shorewall show zones - displays the contents of all zones. Requires
-        DYNAMIC_ZONES=Yes in /etc/shorewall/shorewall.conf
+    shorewall show zones - displays the contents of all zones.
 
     When -x is given, that option is also passed to iptables to display actual packet and byte counts."
 	;;

Shorewall2/releasenotes.txt

@@ -713,9 +713,9 @@ New Features:
     Shorewall. If not specified, the iptables executable determined by
     the PATH setting is used.
 
-31) When DYNAMIC_ZONES=Yes in /etc/shorewall/shorewall.conf, you can
-    now use the "shorewall show zones" command to display the current
-    contents of the zones.
+31) You can now use the "shorewall show zones" command to display the
+    current contents of the zones. This is particularly useful if you
+    use dynamic zones (DYNAMIC_ZONES=Yes in shorewall.conf).
 
     Example:
 

Shorewall2/shorewall

@@ -927,7 +927,7 @@ case "$1" in
 		done < $STATEDIR/zones
 		echo
 	    else
-		echo "   ERROR: Dynamic zones are not enabled" >&2
+		echo "   ERROR: $STATEDIR/zones does not exist" >&2
 		exit 1
 	    fi
 	    ;;