From 0505af9dc07f3a2b46d15e726d40585e4ee20099 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 20 Apr 2015 23:14:11 +0200 Subject: [PATCH] rules.pl: fix geoip initialisation. --- config/firewall/rules.pl | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 5358996114..daa95651bb 100644 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -580,17 +580,15 @@ sub p2pblock { sub geoipblock { my %geoipsettings = (); + $geoipsettings{'GEOIPBLOCK_ENABLED'} = "off"; + + # Flush iptables chain. + run("$IPTABLES -F GEOIPBLOCK"); # Check if the geoip settings file exists if (-e "$geoipfile") { # Read settings file &General::readhash("$geoipfile", \%geoipsettings); - } else { - # Drop active rules. - run("$IPTABLES -F GEOIPBLOCK"); - - # Exit submodule, go on processing the remaining script - return; } # If geoip blocking is not enabled, we are finished here. @@ -602,9 +600,6 @@ sub geoipblock { # Get supported locations. my @locations = &fwlib::get_geoip_locations(); - # Flush iptables chain. - run("$IPTABLES -F GEOIPBLOCK"); - # Loop through all supported geoip locations and # create iptables rules, if blocking this country # is enabled. -- 2.39.5