aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fuchs <mfuchs@pfsense.org>2007-10-29 23:50:30 +0000
committerMartin Fuchs <mfuchs@pfsense.org>2007-10-29 23:50:30 +0000
commit8ce4c10af01cf34b4ae00f5643b64d703a278abd (patch)
treeb947fefc9e8e440c56a4a48ca10189e1d87225da
parent396c72a9a8d78301e34503f4a28e027e06045469 (diff)
downloadpfsense-packages-8ce4c10af01cf34b4ae00f5643b64d703a278abd.tar.gz
pfsense-packages-8ce4c10af01cf34b4ae00f5643b64d703a278abd.tar.bz2
pfsense-packages-8ce4c10af01cf34b4ae00f5643b64d703a278abd.zip
squid: rename confusing var-name
-rw-r--r--packages/squid/squid.inc4
-rw-r--r--packages/squid/squid.xml2
2 files changed, 3 insertions, 3 deletions
diff --git a/packages/squid/squid.inc b/packages/squid/squid.inc
index 22af123b..840bbf33 100644
--- a/packages/squid/squid.inc
+++ b/packages/squid/squid.inc
@@ -296,7 +296,7 @@ function squid_validate_general($post, $input_errors) {
$input_errors[] = "You can not run squid on the same port as the webgui";
}
- if (($post['transparent_proxy'] != 'on') && ($post['private_subnet_proxy'] == 'on')) {
+ if (($post['transparent_proxy'] != 'on') && ($post['private_subnet_proxy_off'] == 'on')) {
$input_errors[] = "You can not disable forwarding traffic to private subnets to the proxy server without using the transparent proxy.";
}
@@ -1044,7 +1044,7 @@ function squid_generate_rules($type) {
switch($type) {
case 'nat':
$rules .= "\n# Setup Squid proxy redirect\n";
- if ($squid_conf['private_subnet_proxy'] == 'on') {
+ if ($squid_conf['private_subnet_proxy_off'] == 'on') {
foreach ($ifaces as $iface){
$rules .= "no rdr on $iface proto tcp from any to { 192.168.0.0/16, 172.16.0.0/12, 10.0.0.0/8 } port 80\n";
}
diff --git a/packages/squid/squid.xml b/packages/squid/squid.xml
index b1cc8b71..5c19d96f 100644
--- a/packages/squid/squid.xml
+++ b/packages/squid/squid.xml
@@ -169,7 +169,7 @@
<required/>
</field>
<field>
- <fieldname>private_subnet_proxy</fieldname>
+ <fieldname>private_subnet_proxy_off</fieldname>
<fielddescr>Do NOT proxy Private Address Space (RFC 1918)</fielddescr>
<description>Do not forward traffic to Private Address Space (RFC 1918) to the proxy server.</description>
<type>checkbox</type>