diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt index 7ff5e446e..7559fa0c5 100644 --- a/Shorewall2/changelog.txt +++ b/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. diff --git a/Shorewall2/firewall b/Shorewall2/firewall index eec8af994..1a7677ee7 100755 --- a/Shorewall2/firewall +++ b/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 diff --git a/Shorewall2/help b/Shorewall2/help index 9b830efcc..61551ab34 100644 --- a/Shorewall2/help +++ b/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." ;; diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt index 1dccc5f81..2edb27001 100755 --- a/Shorewall2/releasenotes.txt +++ b/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: diff --git a/Shorewall2/shorewall b/Shorewall2/shorewall index 75d42e53b..509f9c381 100755 --- a/Shorewall2/shorewall +++ b/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 ;;