From 368b397c997761207bf2ffd83097b36e3011ee23 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 14 Dec 2004 19:55:51 +0000
Subject: [PATCH] Simplify dynamic blacklist restoration

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1829 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/changelog.txt    | 3 +++
 Shorewall2/firewall         | 2 +-
 Shorewall2/releasenotes.txt | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 03addfb32..993bcfbb2 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -183,3 +183,6 @@ Changes since 2.0.3
 89) Clarify add/delete syntax in /sbin/shorewall usage summary.
 
 90) Implement OpenVPN TCP support
+
+91) Simplify the absurdly over-engineered code that restores the
+    dynamic chain.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index cb0cd6f8f..1aef6c7c7 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5685,7 +5685,7 @@ initialize_netfilter () {
 	    while read target ignore1 ignore2 address rest; do
 		case $target in
 		    DROP|reject)
-			run_iptables2 -A dynamic $(source_ip_range $address) -j $target
+			run_iptables -A dynamic -s $address -j $target
 			;;
 		    *)
 			;;
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 82b660cff..55a136eaa 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -193,7 +193,7 @@ Problems corrected since 2.2.0 Beta 8:
    help summary produced by /sbin/shorewall.
 
 -----------------------------------------------------------------------
-Issues when migrating from Shorewall 2.0 to Shorewall 2.1:
+Issues when migrating from Shorewall 2.0 to Shorewall 2.2:
 
 1)  Shorewall configuration files except shorewall.conf are now empty
     (they contain only comments). If you wish to retain the defaults