From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] BUG11805: Firewallrule with source orange and target firewall-interface-orange not possible Date: Wed, 22 Aug 2018 11:14:22 +0100 Message-ID: In-Reply-To: <20180822092316.25418-1-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5572316454770193877==" List-Id: --===============5572316454770193877== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi, On Wed, 2018-08-22 at 11:23 +0200, Alexander Marx wrote: > From: Alexander Marx >=20 > Now its possible to create a rule with orange source and target orange inte= rface of the firewall. >=20 > fixes: #11805 >=20 > Signed-off-by: Alexander Marx > --- > html/cgi-bin/firewall.cgi | 4 ---- > lfs/apcupsd | 2 +- > 2 files changed, 1 insertion(+), 5 deletions(-) >=20 > diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi > index 499f279d1..fb1c25dfd 100644 > --- a/html/cgi-bin/firewall.cgi > +++ b/html/cgi-bin/firewall.cgi > @@ -241,10 +241,6 @@ if ($fwdfwsettings{'ACTION'} eq 'saverule') > $checkorange=3D'on'; > } > } > - #check useless rules > - if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange e= q 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){ > - $errormessage.=3D$Lang::tr{'fwdfw useless rule'}."
"; > - } Does this exist for any other zones, too? > #check if we try to break rules > if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq '= ipfire'){ > $errormessage=3D$Lang::tr{'fwdfw err same'}; > diff --git a/lfs/apcupsd b/lfs/apcupsd > index ce36c3c6f..773dace74 100644 > --- a/lfs/apcupsd > +++ b/lfs/apcupsd > @@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > @$(PREBUILD) > @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) > cd $(DIR_APP) && ./configure --prefix=3D/usr --enable-usb --enable-cgi \ > - --with-cgi-bin=3D/srv/web/ipfire/cgi-bin > + --with-cgi-bin=3D/srv/web/ipfire/cgi-bin --sysconfdir=3D/var/ipfire/u= ps This doesn't belong here. > cd $(DIR_APP) && make $(MAKETUNING) > cd $(DIR_APP) && make install > =20 --===============5572316454770193877==--