Merge branch 'next'

This commit is contained in:
Arne Fitzenreiter
2014-10-10 18:13:13 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -239,7 +239,7 @@ sub get_interface
return "$netsettings{'BLUE_DEV'}";
}
if($net eq "0.0.0.0/0") {
return "$netsettings{'RED_DEV'}";
return &get_external_interface();
}
return "";
}

View File

@@ -7,4 +7,5 @@ srv/web/ipfire/cgi-bin/fwhosts.cgi
srv/web/ipfire/cgi-bin/urlfilter.cgi
usr/lib/firewall/firewall-lib.pl
usr/lib/firewall/rules.pl
usr/local/bin/update-lang-cache
var/ipfire/langs