From d8d466530ffd56f06d9fbd00c02a87d790e500df Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Thu, 23 Sep 2004 14:30:54 +0000
Subject: [PATCH] Fix DELAYBLACKLISTLOAD=No

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

diff --git a/Shorewall2/changelog.txt b/Shorewall2/changelog.txt
index 44ee51cb4..4787960fb 100644
--- a/Shorewall2/changelog.txt
+++ b/Shorewall2/changelog.txt
@@ -85,3 +85,5 @@ Changes since 2.0.3
 40) Implement DELAYBLACKLISTLOAD.
 
 41) Avoid double-setting proxy arp flags.
+
+42) Fix DELAYBLACKLISTLOAD=No.
diff --git a/Shorewall2/firewall b/Shorewall2/firewall
index 490d1af20..84dd5de3a 100755
--- a/Shorewall2/firewall
+++ b/Shorewall2/firewall
@@ -5133,7 +5133,7 @@ setup_blacklist() {
 
 	[ "$disposition" = REJECT ] && disposition=reject
 
-	if [ -n "$DELAYBLACKLISTLOAD" ]; then
+	if [ -z "$DELAYBLACKLISTLOAD" ]; then
 	    while read networks protocol ports; do
 		expandv networks protocol ports
 		process_blacklist_rec
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index 9a9adb8b6..263e294f8 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -61,6 +61,12 @@ Problems corrected since 2.1.8
 3)  With complex proxy arp configurations involving two or more 
     ordered pairs of interfaces, the /proc/sys/net/ipv4/conf/*/proxy_arp
     flags were sometimes set incorrectly. This has been fixed.
+
+Problems corrected since 2.1.9
+
+1)  With DELAYBLACKLISTLOAD=No, the blacklist was previously not
+    loaded.
+
 -----------------------------------------------------------------------
 Issues when migrating from Shorewall 2.0 to Shorewall 2.1: