diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2015-10-29 16:21:02 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2015-11-04 12:34:30 +0100 |
| commit | 8eeaf11d41aff403f13e423dae260aa2ad17b674 (patch) | |
| tree | cbc8398a734cb885c18f26fbef5fc4a477a901ab /apps/user_ldap | |
| parent | 475b52c93b052fbe5ab563330af4e0abcef0b87c (diff) | |
| download | nextcloud-server-8eeaf11d41aff403f13e423dae260aa2ad17b674.tar.gz nextcloud-server-8eeaf11d41aff403f13e423dae260aa2ad17b674.zip | |
add port to host only, if an URL is used instead of a plain hostname
Diffstat (limited to 'apps/user_ldap')
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 0c7fecfdb64..e53ff35cfd6 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -1290,9 +1290,13 @@ class Wizard extends LDAPUtility { if(!is_null($this->cr)) { return $this->cr; } - $cr = $this->ldap->connect( - $this->configuration->ldapHost.':'.$this->configuration->ldapPort, - $this->configuration->ldapPort); + + $host = $this->configuration->ldapHost; + if(strpos($host, '://') !== false) { + //ldap_connect ignores port parameter when URLs are passed + $host .= ':' . $this->configuration->ldapPort; + } + $cr = $this->ldap->connect($host, $this->configuration->ldapPort); $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3); $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0); |