Blacklist before DHCP

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@749 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2003-10-01 00:07:14 +00:00
parent 2e4f97175d
commit 45e63c15ac
3 changed files with 11 additions and 5 deletions

View File

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

View File

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

View File

@ -81,6 +81,10 @@ Problems Corrected since version 1.4.6:
Shorewall now reports a fatal error if neither of these two files Shorewall now reports a fatal error if neither of these two files
exist and correctly removes the lock file. 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: Migration Issues:
1) IP Traffic Accounting is changed from Snapshot 20030813. 1) IP Traffic Accounting is changed from Snapshot 20030813.