GeoIP: Do not crash when locations database does not exist

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

diff --git a/config/cfgroot/geoip-functions.pl b/config/cfgroot/geoip-functions.pl
index d03503a3f9ad0a2f8e38bdb2da660ecbdda43550..b2319daaaffe7168d04cfafeabb2113af92cd08a 100644 (file)
--- a/config/cfgroot/geoip-functions.pl
+++ b/config/cfgroot/geoip-functions.pl
@@ -122,10 +122,10 @@ sub get_full_country_name($) {
 
 # Function to get all available GeoIP locations.
 sub get_geoip_locations() {
-       my @locations;
+       my @locations = ();
 
        # Open the location database.
-       open(LOCATION, "$geoip_database_dir/$location_database") or die "Could not open $geoip_database_dir/$location_database. $!\n";
+       open(LOCATION, "$geoip_database_dir/$location_database") or return @locations;
 
        # Loop through the file.
        while(my $line = <LOCATION>) {

diff --git a/config/rootfiles/core/130/filelists/files b/config/rootfiles/core/130/filelists/files
index b6ee45da7be1ed47c7107dab28e496b7be86781f..28a32a7c655193416ec283e312cb2bb5fc140079 100644 (file)
--- a/config/rootfiles/core/130/filelists/files
+++ b/config/rootfiles/core/130/filelists/files
@@ -21,6 +21,7 @@ usr/sbin/convert-snort
 var/ipfire/backup/bin/backup.pl
 var/ipfire/backup/include
 var/ipfire/general-functions.pl
+var/ipfire/geoip-functions.pl
 var/ipfire/ids-functions.pl
 var/ipfire/menu.d/40-services.menu
 var/ipfire/menu.d/50-firewall.menu