From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 22 Jan 2018 13:20:04 +0000 (+0000)
Subject: firewall: Suppress warning about uninitialized array in GeoIP code
X-Git-Tag: v2.19-core118~3^2~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f91201011552f88f81013cdf57f29cabdf2b613;p=people%2Fstevee%2Fipfire-2.x.git

firewall: Suppress warning about uninitialized array in GeoIP code

Fixes #11597

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 8b0c6ddc8e..9817634c84 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -608,7 +608,7 @@ sub geoipblock {
 	# create iptables rules, if blocking this country
 	# is enabled.
 	foreach my $location (@locations) {
-		if($geoipsettings{$location} eq "on") {
+		if(exists $geoipsettings{$location} && $geoipsettings{$location} eq "on") {
 			run("$IPTABLES -A GEOIPBLOCK -m geoip --src-cc $location -j DROP");
 		}
 	}
diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/core/118/filelists/files
index c07489f9f0..f04bca68ca 100644
--- a/config/rootfiles/core/118/filelists/files
+++ b/config/rootfiles/core/118/filelists/files
@@ -11,6 +11,7 @@ srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
 srv/web/ipfire/cgi-bin/logs.cgi/urlfilter.dat
+usr/lib/firewall/rules.pl
 usr/local/bin/rebuild-initrd
 usr/local/bin/syslogdctrl
 usr/sbin/updxlrator