aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordoktornotor <notordoktor@gmail.com>2015-10-14 10:50:07 +0200
committerdoktornotor <notordoktor@gmail.com>2015-10-14 10:50:07 +0200
commitbf982fd21fd14e961249f23264b22bf165b3d2ae (patch)
tree1e1f2f9e441264c49eb974e3b17b3c0a059fae3f
parentb78cdd190df597857c61a85ee2e3f03c2ad4b16f (diff)
downloadpfsense-packages-bf982fd21fd14e961249f23264b22bf165b3d2ae.tar.gz
pfsense-packages-bf982fd21fd14e961249f23264b22bf165b3d2ae.tar.bz2
pfsense-packages-bf982fd21fd14e961249f23264b22bf165b3d2ae.zip
Don't truncate the hostname if none exists in 'External FQDN'
-rwxr-xr-xconfig/squid3/34/squid_reverse.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/config/squid3/34/squid_reverse.inc b/config/squid3/34/squid_reverse.inc
index 9693b21f..f19652b4 100755
--- a/config/squid3/34/squid_reverse.inc
+++ b/config/squid3/34/squid_reverse.inc
@@ -209,7 +209,11 @@ 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'], '.');
+ if (substr_count($settings['reverse_external_fqdn'], ".") > 1) {
+ $reverse_external_domain = strstr($settings['reverse_external_fqdn'], '.');
+ } else {
+ $reverse_external_domain = $settings['reverse_external_fqdn'];
+ }
$conf .= "acl OWA_URI_pfs url_regex -i ^http://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n";
$conf .= "acl OWA_URI_pfs url_regex -i ^https://{$settings['reverse_external_fqdn']}/AutoDiscover/AutoDiscover.xml\n";
$conf .= "acl OWA_URI_pfs url_regex -i ^http://autodiscover{$reverse_external_domain}/AutoDiscover/AutoDiscover.xml\n";