[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0505af9dc07f3a2b46d15e726d40585e4ee20099

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 2019 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  0505af9dc07f3a2b46d15e726d40585e4ee20099 (commit)
      from  785c9195204b12f9391d3d13e56e7ec11576cfeb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0505af9dc07f3a2b46d15e726d40585e4ee20099
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Apr 20 23:14:11 2015 +0200

    rules.pl: fix geoip initialisation.

-----------------------------------------------------------------------

Summary of changes:
 config/firewall/rules.pl | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 5358996..daa9565 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.


hooks/post-receive
--
IPFire 2.x development tree