From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4bS3wN4pBrz32vw for ; Wed, 25 Jun 2025 14:24:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4bS3wN4ZB5z2y7D for ; Wed, 25 Jun 2025 14:24:04 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4bS3wM6wRZzQv for ; Wed, 25 Jun 2025 14:24:03 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1750861443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=7r7JI+xF9e0c6uoQP3+XIPszpJmU3AA3DPy1wAWUAK0=; b=2cHVyOSL2cAycYwSpw1Q+qtYQUc4fw4UVivXekV/PVpjBFz6c4+h26B/ZIefcWcY/9QON2 ScUrXHYLFaIVNqBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1750861443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=7r7JI+xF9e0c6uoQP3+XIPszpJmU3AA3DPy1wAWUAK0=; b=am9IJU7VcBciJjhuh7kwo5FFKyzTh55jPU7EpdWoFf9g+K6pi9oXGhtwRJagtr3nV/vJTe OmThs9DvgPeTheZHRHFflpoj0MsJe7j+lU9tFfRp+ffJla35vHP++oZBI36rCD66CS2oIs nvDCN0RHstoCO8mP1Xc8VAxigK5q9dKZwM2CD6SsBmj9FTVk9mE3bVfwcFch/7TPflaN0S yyCxuupZ12P06iQTP8M52qXpBmPfVeXn0u95GEWdTYvsQ79c9XAg5XoT+1iygryrXIOf1K IF/cm5lfhHRn+R0S+SiAOY3zFaaeYfIupl60xKpXAzigZskO1U56MbwZjqt2sw== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4bS3wM5kMzz2xfL; Wed, 25 Jun 2025 14:24:03 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c1d2c40d30a80981a499ba9260aedb8160b8ba13 X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 5b2a54312df207d20fad0e088deb17bd983fab28 X-Git-Newrev: c1d2c40d30a80981a499ba9260aedb8160b8ba13 Message-Id: <4bS3wM5kMzz2xfL@people01.haj.ipfire.org> Date: Wed, 25 Jun 2025 14:24:03 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 Date: Wed Jun 25 15:23:47 2025 +0100 core196: Ship firewall.cgi Signed-off-by: Michael Tremer commit 0ee4f61deaf50b5c091d94afbedd5615c002cfae Author: Michael Tremer 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 ----------------------------------------------------------------------- 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
"; } }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