This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 (commit) via d303638793c2ad21e296289eadc4ec3584bd215d (commit) from 7141cb1ee4fab26771319fc5cf61f454f321bcaf (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 702f0ba8357aa11ccee4cf7c43efd5d8f362a343 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Aug 22 14:46:53 2018 +0100
core124: Ship updated firewall.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d303638793c2ad21e296289eadc4ec3584bd215d Author: Alexander Marx amarx@ipfire.org Date: Wed Aug 22 11:23:16 2018 +0200
BUG11805: Firewall rule with source orange and target firewall-interface-orange not possible
Now its possible to create a rule with orange source and target orange interface of the firewall.
Fixes: #11805
Signed-off-by: Alexander Marx alexander.marx@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/124/filelists/files | 1 + html/cgi-bin/firewall.cgi | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/124/filelists/files b/config/rootfiles/core/124/filelists/files index 34aaf9dfd..ebebccdc1 100644 --- a/config/rootfiles/core/124/filelists/files +++ b/config/rootfiles/core/124/filelists/files @@ -4,6 +4,7 @@ etc/rc.d/helper/aws-setup etc/rc.d/init.d/aws etc/rc.d/init.d/localnet etc/rc.d/init.d/partresize +srv/web/ipfire/cgi-bin/firewall.cgi srv/web/ipfire/cgi-bin/ids.cgi usr/bin/install-bootloader usr/local/bin/backupiso 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='on'; } } - #check useless rules - if( ($fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'ORANGE' || $checkorange eq 'on') && $fwdfwsettings{'grp2'} eq 'ipfire'){ - $errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>"; - } #check if we try to break rules if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){ $errormessage=$Lang::tr{'fwdfw err same'};
hooks/post-receive -- IPFire 2.x development tree