From 8ce4c10af01cf34b4ae00f5643b64d703a278abd Mon Sep 17 00:00:00 2001
From: Martin Fuchs <mfuchs@pfsense.org>
Date: Mon, 29 Oct 2007 23:50:30 +0000
Subject: squid: rename confusing var-name

---
 packages/squid/squid.inc | 4 ++--
 packages/squid/squid.xml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'packages')

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>
-- 
cgit v1.2.3