From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
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 14:45:06 +0100
Message-ID: <8cd75964213152b93808d8ad5077e7b8f7c81325.camel@ipfire.org>
In-Reply-To: <15d25b60-b486-8e02-b6f6-f5c1af78880a@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4904529254984605113=="
List-Id: <development.lists.ipfire.org>

--===============4904529254984605113==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On Wed, 2018-08-22 at 14:24 +0200, Alexander Marx wrote:
>=20
> Am 22.08.2018 um 12:14 schrieb Michael Tremer:
> > Hi,
> >=20
> > On Wed, 2018-08-22 at 11:23 +0200, Alexander Marx wrote:
> > > From: Alexander Marx <amarx(a)ipfire.org>
> > >=20
> > > Now its possible to create a rule with orange source and target orange =
interface of the firewall.
> > >=20
> > > fixes: #11805
> > >=20
> > > Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
> > > ---
> > >  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' || $checkoran=
ge eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){
> > > -		$errormessage.=3D$Lang::tr{'fwdfw useless rule'}."<br>";
> > > -	}
> >=20
> > Does this exist for any other zones, too?
>=20
> No. Thats the only point in code where a useless rule is checked

Well, it is actually not that useless :)

Best,
-Michael

> >=20
> > >  	#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-cg=
i \
> > > -					--with-cgi-bin=3D/srv/web/ipfire/cgi-bin
> > > +					--with-cgi-bin=3D/srv/web/ipfire/cgi-bin --sysconfdir=3D/var/ipfi=
re/ups
> >=20
> > This doesn't belong here.
>=20
> right. Please ignore this part.
> >=20
> > >  	cd $(DIR_APP) && make $(MAKETUNING)
> > >  	cd $(DIR_APP) && make install
> > > =20
>=20
>=20


--===============4904529254984605113==--