aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2013-01-25 08:05:04 -0800
committerErmal Luçi <eri@pfsense.org>2013-01-25 08:05:04 -0800
commitd482ed1605fe52a3eba666f4ac303fed5bebe8db (patch)
treec2a5f341a765774ec6cc0956fc9b62e4a32f4efd
parent53fe00495d2c21a11f7cb3653f7f0bb2a0dec294 (diff)
parent7dd26da21739390216c013c0a3b0758b716ea7f8 (diff)
downloadpfsense-packages-d482ed1605fe52a3eba666f4ac303fed5bebe8db.tar.gz
pfsense-packages-d482ed1605fe52a3eba666f4ac303fed5bebe8db.tar.bz2
pfsense-packages-d482ed1605fe52a3eba666f4ac303fed5bebe8db.zip
Merge pull request #361 from dbaio/master
Fix creation of acl noauth (squid)
-rw-r--r--config/squid/squid.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 54e87c1a..960bad67 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -1041,9 +1041,12 @@ function squid_resync_auth() {
$conf .= "http_access allow $acl\n";
}
else {
- $noauth = implode(' ', explode("\n", base64_decode($settings['no_auth_hosts'])));
+ $noauth = base64_decode($settings['no_auth_hosts']);
if (!empty($noauth)) {
- $conf .= "acl noauth src $noauth\n";
+ foreach (explode("\n", $noauth) as $host) {
+ $host = trim($host);
+ $conf .= "acl noauth src $host\n";
+ }
$valid_acls[] = 'noauth';
}