aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fuchs <mfuchs77@gmail.com>2014-05-08 17:45:18 +0200
committerMartin Fuchs <mfuchs77@gmail.com>2014-05-08 17:45:18 +0200
commit12b5094bb436d8963112aed99e6804bdac9232a3 (patch)
tree9473d78f6a247bd850b421e61d0aa861f0be30db
parente6fe6bcdd5d7b21c0f42a1177fd504c25c4c714e (diff)
downloadpfsense-packages-12b5094bb436d8963112aed99e6804bdac9232a3.tar.gz
pfsense-packages-12b5094bb436d8963112aed99e6804bdac9232a3.tar.bz2
pfsense-packages-12b5094bb436d8963112aed99e6804bdac9232a3.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";