diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index cb2f2c0de..18473a888 100755 --- a/Shorewall/changelog.txt +++ b/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. \ No newline at end of file diff --git a/Shorewall/firewall b/Shorewall/firewall index 41168c64c..d7540bfa0 100755 --- a/Shorewall/firewall +++ b/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 # diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index d25fb6a51..48880f200 100755 --- a/Shorewall/releasenotes.txt +++ b/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.