Fix for empty blacklist file

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5171 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-30 17:30:53 +00:00
parent 7bcd9406bc
commit 46cffe3dd3
3 changed files with 19 additions and 3 deletions

View File

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

View File

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

View File

@ -28,6 +28,13 @@ Release Highlights
/etc/shorewall/route_rules and reverses those changes when /etc/shorewall/route_rules and reverses those changes when
appropriate. 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: Migration Considerations:
1) Shorewall supports the notion of "default actions". A default 1) Shorewall supports the notion of "default actions". A default