From: Bernhard Held <berny156@gmx.de>
To: development@lists.ipfire.org
Subject: [PATCH v2 3/4] proxy.cgi: strip newline from subnet parameter
Date: Mon, 12 Feb 2018 23:19:31 +0100 [thread overview]
Message-ID: <20180212221932.29122-4-berny156@gmx.de> (raw)
In-Reply-To: <20180212221932.29122-1-berny156@gmx.de>
[-- Attachment #1: Type: text/plain, Size: 978 bytes --]
$temp[1] might end with a newline; this is unavoidable when specifying
serveral subnets. Thus, 'chomp $temp[1];' has to be moved before the
comparisons with the green and blue subnets. Otherwise the comparison
might always be wrong due to the newline.
---
html/cgi-bin/proxy.cgi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6aa14e15a..ea3b41126 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3064,12 +3064,12 @@ END
foreach (@templist)
{
@temp = split(/\//);
+ chomp $temp[1];
if (
($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) && ($temp[1] ne $netsettings{'GREEN_NETMASK'}) &&
($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) && ($temp[1] ne $netsettings{'BLUE_NETMASK'})
)
{
- chomp $temp[1];
print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$temp[1]\"))";
}
}
--
2.16.1
next prev parent reply other threads:[~2018-02-12 22:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 22:19 [PATCH v2 0/4] proxy.cgi fixes for bugzilla #10852 Bernhard Held
2018-02-12 22:19 ` [PATCH v2 1/4] Network::network_equal: fix check if array is fully defined Bernhard Held
2018-02-12 22:19 ` [PATCH v2 2/4] Network::network2bin: return an empty list in case of error Bernhard Held
2018-02-13 11:52 ` Aw: " Bernhard Bitsch
2018-02-12 22:19 ` Bernhard Held [this message]
2018-02-12 22:19 ` [PATCH v2 4/4] proxy.cgi: fix subnet comparison for proxy.pac generation Bernhard Held
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=20180212221932.29122-4-berny156@gmx.de \
--to=berny156@gmx.de \
--cc=development@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