aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanilo G. Baio (dbaio) <dbaio@bsd.com.br>2013-01-24 22:28:44 -0200
committerDanilo G. Baio (dbaio) <dbaio@bsd.com.br>2013-01-24 22:28:44 -0200
commit4c1748a29889bba8fccadb18926a6c7ae1eec5fd (patch)
treeabc660d842b9233c0637770b335a8e19c03ea30e
parent23e79c9b263391e2305e7df7ac89c05bf133f416 (diff)
downloadpfsense-packages-4c1748a29889bba8fccadb18926a6c7ae1eec5fd.tar.gz
pfsense-packages-4c1748a29889bba8fccadb18926a6c7ae1eec5fd.tar.bz2
pfsense-packages-4c1748a29889bba8fccadb18926a6c7ae1eec5fd.zip
Revert "Fix creation of acl noauth"
This reverts commit 23e79c9b263391e2305e7df7ac89c05bf133f416.
-rw-r--r--config/squid/squid.inc7
1 files changed, 2 insertions, 5 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 00d6c1cf..54e87c1a 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -1041,12 +1041,9 @@ function squid_resync_auth() {
$conf .= "http_access allow $acl\n";
}
else {
- $noauth = base64_decode($settings['no_auth_hosts']);
+ $noauth = implode(' ', explode("\n", base64_decode($settings['no_auth_hosts'])));
if (!empty($noauth)) {
- foreach (split("\n", $noauth) as $host) {
- $host = trim($host);
- $conf .= "acl noauth src $host\n";
- }
+ $conf .= "acl noauth src $noauth\n";
$valid_acls[] = 'noauth';
}