From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c1d2c40d30a80981a499ba9260aedb8160b8ba13
Date: Wed, 25 Jun 2025 14:24:03 +0000 (UTC) [thread overview]
Message-ID: <4bS3wM5kMzz2xfL@people01.haj.ipfire.org> (raw)
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 c1d2c40d30a80981a499ba9260aedb8160b8ba13 (commit)
via 0ee4f61deaf50b5c091d94afbedd5615c002cfae (commit)
from 5b2a54312df207d20fad0e088deb17bd983fab28 (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 c1d2c40d30a80981a499ba9260aedb8160b8ba13
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Jun 25 15:23:47 2025 +0100
core196: Ship firewall.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 0ee4f61deaf50b5c091d94afbedd5615c002cfae
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed Jun 25 15:22:32 2025 +0100
firewall.cgi: Remove some left-over debugging code
This code prevented that any firewall rules could have been created due
to the WUI always assuming that there would be some error.
Fixes: #13860 - Error message when creating a firewall rule with a subnet for src
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/196/filelists/files | 1 +
html/cgi-bin/firewall.cgi | 6 ------
2 files changed, 1 insertion(+), 6 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/196/filelists/files b/config/rootfiles/core/196/filelists/files
index de28ba077..60ebd2c7f 100644
--- a/config/rootfiles/core/196/filelists/files
+++ b/config/rootfiles/core/196/filelists/files
@@ -1,4 +1,5 @@
etc/rc.d/init.d/networking/red
+srv/web/ipfire/cgi-bin/firewall.cgi
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/netexternal.cgi
srv/web/ipfire/cgi-bin/netovpnsrv.cgi
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index 855be095d..5f1eac09e 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -876,12 +876,6 @@ sub checkrule
$hint.=$Lang::tr{'fwdfw hint ip2'}." Source: $networkip1/$scidr Target: $networkip2/$tcidr<br>";
}
}else{
- $errormessage .= $sip;
- $errormessage .= $scidr;
-
- $errormessage .= $tip;
- $errormessage .= $tcidr;
-
if ( &General::IpInSubnet($networkip2,$sip,&General::iporsubtodec($scidr)) ){
$errormessage.=$Lang::tr{'fwdfw err samesub'} . $fwdfwsettings{'grp1'} .$fwdfwsettings{$fwdfwsettings{'grp1'}} . $fwdfwsettings{'grp2'} . $fwdfwsettings{$fwdfwsettings{'grp2'}};
}
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2025-06-25 14:24 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4bS3wM5kMzz2xfL@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox