diff options
author | root <leo@strike.wu.ac.at> | 2013-12-10 17:50:45 +0100 |
---|---|---|
committer | Alexander Bergolth <leo@strike.wu.ac.at> | 2014-03-06 12:07:03 +0100 |
commit | 8fcc29ee8b7b5ed600c8ec7116f52486718467f6 (patch) | |
tree | 6a42655dab7314564401c381be897b21cd27a4a2 /apps/user_ldap/lib/wizard.php | |
parent | 7c3f3cc93348a23ee20bb75250a7313412fa2085 (diff) | |
download | nextcloud-server-8fcc29ee8b7b5ed600c8ec7116f52486718467f6.tar.gz nextcloud-server-8fcc29ee8b7b5ed600c8ec7116f52486718467f6.zip |
only check ldap_errno if an ldap_* function actually fails
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
(avoids json_encode(): Invalid UTF-8 sequence in argument errors)
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 e79090febc1..04ea87d53e5 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); |