[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1f91201011552f88f81013cdf57f29cabdf2b613

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1f91201011552f88f81013cdf57f29cabdf2b613

[git]

[-- Attachment #1: Type: text/plain, Size: 2290 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  1f91201011552f88f81013cdf57f29cabdf2b613 (commit)
      from  e0a048fe210c5f039e2d87e8331053099a0d65f0 (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 1f91201011552f88f81013cdf57f29cabdf2b613
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Jan 22 13:20:04 2018 +0000

    firewall: Suppress warning about uninitialized array in GeoIP code
    
    Fixes #11597
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 config/firewall/rules.pl                  | 2 +-
 config/rootfiles/core/118/filelists/files | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 8b0c6ddc8..9817634c8 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 c07489f9f..f04bca68c 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


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