From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11805: Firewallrule with source orange and target firewall-interface-orange not possible Date: Wed, 22 Aug 2018 11:23:16 +0200 Message-ID: <20180822092316.25418-1-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============9035032008596201286==" List-Id: --===============9035032008596201286== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Alexander Marx Now its possible to create a rule with orange source and target orange interf= ace of the firewall. fixes: #11805 Signed-off-by: Alexander Marx --- html/cgi-bin/firewall.cgi | 4 ---- lfs/apcupsd | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) 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 eq = 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){ - $errormessage.=3D$Lang::tr{'fwdfw useless rule'}."
"; - } #check if we try to break rules if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ip= fire'){ $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/ups cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install =20 --=20 2.17.1 --===============9035032008596201286==--