Fix for empty blacklist file

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

Shorewall/changelog.txt

@@ -1,3 +1,7 @@
+Changes in 3.4.0 Beta 2
+
+1)  Fix for empty blacklist file.
+
 Changes in 3.4.0 Beta 1
 
 1)  Correct handling of masq file.

Shorewall/compiler

@@ -3300,9 +3300,14 @@ load_blacklist()
 __EOF__
     INDENT="    "
 
-    while read networks protocol ports; do
-	process_blacklist_rec
-    done < $TMP_DIR/blacklist
+    if [ -s $TMP_DIR/blacklist ]; then
+
+	while read networks protocol ports; do
+	    process_blacklist_rec
+	done < $TMP_DIR/blacklist
+    else
+	save_command true
+    fi
 
     INDENT=
     save_command "}"

Shorewall/releasenotes.txt

@@ -28,6 +28,13 @@ Release Highlights
     /etc/shorewall/route_rules and reverses those changes when
     appropriate.
 
+Problems Corrected in 3.4.0 Beta 2
+
+1)  If 'blacklist' was specified on an interface and the
+    /etc/shorewall/blacklist was empty, then the generated firewall
+    script contained a syntax error (the function load_blacklist() was
+    empty).
+
 Migration Considerations:
 
 1)  Shorewall supports the notion of "default actions". A default