aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-13 22:38:52 +0200
committerMartin Fuchs <martin.fuchs@trendchiller.com>2011-09-13 22:38:52 +0200
commitb6fdab593cef58a84258fe6806e89b392204dd8e (patch)
treeb40b481c61ae55324bedf1512094c3ae7a38dd9b /config
parent8296e1887080e8ae56d9c36e8f531caccfa65b7f (diff)
downloadpfsense-packages-b6fdab593cef58a84258fe6806e89b392204dd8e.tar.gz
pfsense-packages-b6fdab593cef58a84258fe6806e89b392204dd8e.tar.bz2
pfsense-packages-b6fdab593cef58a84258fe6806e89b392204dd8e.zip
squid: finally remove obsolete checks
Diffstat (limited to 'config')
-rw-r--r--config/squid/squid.inc13
-rw-r--r--config/squid3/squid.inc13
2 files changed, 0 insertions, 26 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index d36c836a..8dd2cc8e 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -324,19 +324,6 @@ 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_off'] == 'on')) {
- $input_errors[] = "You can not bypass traffic to private subnets without using the transparent proxy.";
- }
-
- if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off'])) {
- $input_errors[] = "You can not bypass traffic from specific IPs without using the transparent proxy.";
- }
- if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off_dest'])) {
- $input_errors[] = "You can not bypass traffic to specific IPs without using the transparent proxy.";
- }
-*/
-
foreach (array('defined_ip_proxy_off') as $hosts) {
foreach (explode(";", $post[$hosts]) as $host) {
$host = trim($host);
diff --git a/config/squid3/squid.inc b/config/squid3/squid.inc
index 1e720ae7..c1b5b419 100644
--- a/config/squid3/squid.inc
+++ b/config/squid3/squid.inc
@@ -344,19 +344,6 @@ 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_off'] == 'on')) {
- $input_errors[] = "You can not bypass traffic to private subnets without using the transparent proxy.";
- }
-
- if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off'])) {
- $input_errors[] = "You can not bypass traffic from specific IPs without using the transparent proxy.";
- }
- if (($post['transparent_proxy'] != 'on') && !empty($post['defined_ip_proxy_off_dest'])) {
- $input_errors[] = "You can not bypass traffic to specific IPs without using the transparent proxy.";
- }
-*/
-
foreach (array('defined_ip_proxy_off') as $hosts) {
foreach (explode(";", $post[$hosts]) as $host) {
$host = trim($host);