webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 02:55:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

GeoIP: Do not crash when locations database does not exist

Browse Source 
Fixes: #12021
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2019-03-22 02:58:57 +00:00
parent d4767896cb
commit abe2149852
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/cfgroot/geoip-functions.pl
View File

@@ -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>) {

1
config/rootfiles/core/130/filelists/files
View File

@@ -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