aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fuchs <mfuchs77@gmail.com>2014-05-08 17:45:18 +0200
committerRenato Botelho <garga@FreeBSD.org>2014-05-08 13:29:32 -0300
commitb3be73ad2331dae6514faacc0014886fcf7c6bcf (patch)
tree22f7b8d0129fcf2a6def5bafdb0dd8a8da07e5f8
parent6a3d0510d4c2d2bbdbeda22493963781cfdf2b6a (diff)
downloadpfsense-packages-b3be73ad2331dae6514faacc0014886fcf7c6bcf.tar.gz
pfsense-packages-b3be73ad2331dae6514faacc0014886fcf7c6bcf.tar.bz2
pfsense-packages-b3be73ad2331dae6514faacc0014886fcf7c6bcf.zip
protect variable name in string and remove spaces
-rw-r--r--config/squid3/31/squid_reverse.inc4
-rwxr-xr-xconfig/squid3/33/squid_reverse.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/config/squid3/31/squid_reverse.inc b/config/squid3/31/squid_reverse.inc
index bfe9cb03..c99659b7 100644
--- a/config/squid3/31/squid_reverse.inc
+++ b/config/squid3/31/squid_reverse.inc
@@ -181,9 +181,9 @@ function squid_resync_reverse() {
if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) {
$reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.');
- $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover$reverse_external_domain/AutoDiscover/AutoDiscover.xml\n";
+ $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
}
- }
+ }
//$conf .= "ssl_unclean_shutdown on";
if (is_array($reverse_maps))
foreach ($reverse_maps as $rm){
diff --git a/config/squid3/33/squid_reverse.inc b/config/squid3/33/squid_reverse.inc
index 064844b6..b865f3c0 100755
--- a/config/squid3/33/squid_reverse.inc
+++ b/config/squid3/33/squid_reverse.inc
@@ -184,7 +184,7 @@ function squid_resync_reverse() {
if (($settings['reverse_owa'] == 'on') && (!empty($settings['reverse_owa_ip'])) && ($settings['reverse_owa_autodiscover'] == 'on')) {
$reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.');
- $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover$reverse_external_domain/AutoDiscover/AutoDiscover.xml\n";
+ $conf .= "acl OWA_URI_pfs url_regex -i ^https://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";
}
}
//$conf .= "ssl_unclean_shutdown on";