Forward Firewall: removed DMZ from rules.pl (does no longer exist, is forward now

This commit is contained in:
Alexander Marx
2013-06-26 09:07:05 +02:00
committed by Michael Tremer
parent 3f09f5309c
commit 60607a6c75

View File

@@ -44,7 +44,6 @@ our %targethash=();
my @timeframe=();
my %configinputfw=();
my %configoutgoingfw=();
my %configdmzfw=();
my %confignatfw=();
my %aliases=();
my @DPROT=();
@@ -53,7 +52,6 @@ require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/forward/bin/firewall-lib.pl";
my $configdmz = "${General::swroot}/forward/dmz";
my $configfwdfw = "${General::swroot}/forward/config";
my $configinput = "${General::swroot}/forward/input";
my $configoutgoing = "${General::swroot}/forward/outgoing";
@@ -73,7 +71,6 @@ my $dnat='';
my $snat='';
&General::readhash("${General::swroot}/forward/settings", \%fwdfwsettings);
&General::readhash("$netsettings", \%defaultNetworks);
&General::readhasharray($configdmz, \%configdmzfw);
&General::readhasharray($configfwdfw, \%configfwdfw);
&General::readhasharray($configinput, \%configinputfw);
&General::readhasharray($configoutgoing, \%configoutgoingfw);
@@ -154,9 +151,6 @@ sub flush
}
sub preparerules
{
if (! -z "${General::swroot}/forward/dmz"){
&buildrules(\%configdmzfw);
}
if (! -z "${General::swroot}/forward/config"){
&buildrules(\%configfwdfw);
}