extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2025-06-20 09:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

A more elegant fix for empty blacklist file

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5174 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-12-30 19:05:21 +00:00
parent 8558d49676
commit 76e2eefc48
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Shorewall/compiler
View File

@ -1096,7 +1096,7 @@ compile_refresh_firewall()
save_command progress_message2 \"Refreshing Black List...\"
run_iptables -F blacklst
save_command load_blacklist
[ -s ${TMP_DIR}/blacklist ] && save_command load_blacklist
INDENT="$indent"
save_command "fi"
@ -3297,31 +3297,29 @@ process_blacklist()
local disposition=$BLACKLIST_DISPOSITION
local f=$(find_file blacklist)
[ "$disposition" = REJECT ] && disposition=reject
if [ -s $TMP_DIR/blacklist ]; then
progress_message2 "Compiling $f..."
[ "$disposition" = REJECT ] && disposition=reject
cat >&3 << __EOF__
progress_message2 "Compiling $f..."
cat >&3 << __EOF__
#
# Load the blacklist
#
load_blacklist()
{
__EOF__
INDENT=" "
if [ -s $TMP_DIR/blacklist ]; then
INDENT=" "
while read networks protocol ports; do
process_blacklist_rec
done < $TMP_DIR/blacklist
else
save_command true
fi
INDENT=
save_command "}"
save_command
INDENT=
save_command "}"
save_command
fi
}
#