diff options
author | blizzz <blizzz@owncloud.com> | 2014-04-23 16:26:43 +0200 |
---|---|---|
committer | blizzz <blizzz@owncloud.com> | 2014-04-23 16:26:43 +0200 |
commit | 645ecb76448a1452905f8aae6b59ec2bda37653b (patch) | |
tree | bfb0438d6d8483c9d2ee96a1c19f980527428777 /apps/user_ldap/lib/wizard.php | |
parent | 3aee23ee2bc0dfde9da89c1ae62aa0ff9365b1ec (diff) | |
parent | f850fcfac51080baf1af90d59a8d94b80721c819 (diff) | |
download | nextcloud-server-645ecb76448a1452905f8aae6b59ec2bda37653b.tar.gz nextcloud-server-645ecb76448a1452905f8aae6b59ec2bda37653b.zip |
Merge pull request #6297 from leo-b/fix_ldap_errors
only check ldap_errno if an ldap_* function actually fails
Diffstat (limited to 'apps/user_ldap/lib/wizard.php')
-rw-r--r-- | apps/user_ldap/lib/wizard.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 8ddee8c760c..8406b2d42a5 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -799,6 +799,7 @@ class Wizard extends LDAPUtility { \OCP\Util::writeLog('user_ldap', 'Wiz: Setting LDAP Options ', \OCP\Util::DEBUG); //set LDAP options $this->ldap->setOption($cr, LDAP_OPT_PROTOCOL_VERSION, 3); + $this->ldap->setOption($cr, LDAP_OPT_REFERRALS, 0); $this->ldap->setOption($cr, LDAP_OPT_NETWORK_TIMEOUT, self::LDAP_NW_TIMEOUT); if($tls) { $isTlsWorking = @$this->ldap->startTls($cr); |