Fix blacklist loading

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4147 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-06-19 23:57:01 +00:00
parent b62c8406d7
commit 4592b58df6
3 changed files with 15 additions and 12 deletions

View File

@ -2,6 +2,8 @@ Changes in 3.2.0 RC 5
1) Fix DOA 'LITEDIR' problem in /sbin/shorewall.
2) Stop the compiler from running iptables.
-------------------------------------------------------------------------------
Changes in 3.2.0 RC 4

View File

@ -6656,21 +6656,19 @@ refresh_blacklist() {
local f=$(find_file blacklist)
local disposition=$BLACKLIST_DISPOSITION
if qt $IPTABLES -L blacklst -n ; then
progress_message2 "$DOING Black List..."
save_progress_message "Loading Black List..."
progress_message2 "$DOING Black List..."
save_progress_message "Loading Black List..."
strip_file blacklist $f
strip_file blacklist $f
[ "$disposition" = REJECT ] && disposition=reject
[ "$disposition" = REJECT ] && disposition=reject
run_iptables -F blacklst
run_iptables -F blacklst
while read networks protocol ports; do
expandv networks protocol ports
process_blacklist_rec
done < $TMP_DIR/blacklist
fi
while read networks protocol ports; do
expandv networks protocol ports
process_blacklist_rec
done < $TMP_DIR/blacklist
}
#

View File

@ -40,6 +40,9 @@ Problems Corrected in 3.2.0 RC 5
ERROR: LITEDIR not defined in /usr/share/shorewall/configpath
wifitipper:
2) The compiler was running iptables needlessly when DELAYBLACKLISTLOAD=Yes.
This could also result in the blacklist not being loaded in some cases.
Other changes in 3.2.0 RC 5
None.
@ -589,7 +592,7 @@ New Features:
refresh".
18) "load" and "reload" commands have been added. These commands allow
a non-root user with ssh access to a remote system running
a non-root user with ssh access to a remote system running
Shorewall Lite to compile a firewall script on the local system and
to install that script on the remote system.