upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-14 19:20:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #20155 from owncloud/fix-20020

Browse source 
add port to host only, if an URL is used instead of a plain hostname
This commit is contained in:
Morris Jobke 2015-11-04 14:02:43 +01:00
commit 09436e95c4
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/user_ldap/lib/wizard.php
View file

@ -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);