mirror of
https://gitlab.com/shorewall/code.git
synced 2025-03-09 12:01:20 +01:00
Fix broken blacklist generation
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4786 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
0453d79315
commit
8de03b9172
@ -3423,6 +3423,10 @@ process_blacklist_rec() {
|
|||||||
|
|
||||||
process_blacklist()
|
process_blacklist()
|
||||||
{
|
{
|
||||||
|
local disposition=$BLACKLIST_DISPOSITION
|
||||||
|
|
||||||
|
[ "$disposition" = REJECT ] && disposition=reject
|
||||||
|
|
||||||
cat >&3 << __EOF__
|
cat >&3 << __EOF__
|
||||||
#
|
#
|
||||||
# Load the blacklist
|
# Load the blacklist
|
||||||
@ -3447,8 +3451,6 @@ __EOF__
|
|||||||
#
|
#
|
||||||
setup_blacklist() {
|
setup_blacklist() {
|
||||||
local hosts="$(find_hosts_by_option blacklist)"
|
local hosts="$(find_hosts_by_option blacklist)"
|
||||||
local f=$(find_file blacklist)
|
|
||||||
local disposition=$BLACKLIST_DISPOSITION
|
|
||||||
local ipsec policy
|
local ipsec policy
|
||||||
|
|
||||||
if [ -n "$hosts" -a -s ${TMP_DIR}/blacklist ]; then
|
if [ -n "$hosts" -a -s ${TMP_DIR}/blacklist ]; then
|
||||||
@ -3474,8 +3476,6 @@ setup_blacklist() {
|
|||||||
progress_message_and_save " Blacklisting enabled on ${interface}${network}"
|
progress_message_and_save " Blacklisting enabled on ${interface}${network}"
|
||||||
done
|
done
|
||||||
|
|
||||||
[ "$disposition" = REJECT ] && disposition=reject
|
|
||||||
|
|
||||||
if [ -z "$DELAYBLACKLISTLOAD" -a -s ${TMP_DIR}/blacklist ]; then
|
if [ -z "$DELAYBLACKLISTLOAD" -a -s ${TMP_DIR}/blacklist ]; then
|
||||||
save_command load_blacklist
|
save_command load_blacklist
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user