Blacklist before DHCP

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

Shorewall/changelog.txt

@@ -88,3 +88,5 @@ Changes since 1.4.6
 
 39) Fatal error if /etc/shorewall/common or /etc/shoreall/common.def do
     not exist.
+
+40) Process blacklist before DHCP.

Shorewall/firewall

@@ -4027,6 +4027,11 @@ add_common_rules() {
 
     build_common_chain
 
+    #
+    # Process Black List
+    #
+    setup_blacklist
+
     #
     # DHCP
     #
@@ -4180,11 +4185,6 @@ add_common_rules() {
 	    fi
 	done
     fi
-    #
-    # Process Black List
-    #
-    setup_blacklist
-
     #
     # Route Filtering
     #

Shorewall/releasenotes.txt

@@ -81,6 +81,10 @@ Problems Corrected since version 1.4.6:
     Shorewall now reports a fatal error if neither of these two files
     exist and correctly removes the lock file.
 
+16) The order of processing the various options has been changed such
+    that blacklist entries now take precedence over the 'dhcp'
+    interface setting. 
+
 Migration Issues:
 
 1) IP Traffic Accounting is changed from Snapshot 20030813.