mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #19547 from owncloud/fix-16154 

LDAP Wizard: do not be picky about credentials when only looking for …
This commit is contained in:
Thomas Müller 2015-10-05 09:48:13 +02:00
parent 11574eaa90 6d06d1c5a4
commit 09fe808d48
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/user_ldap/lib/wizard.php
View File

@ -661,12 +661,13 @@ class Wizard extends LDAPUtility {
//connectAndBind may throw Exception, it needs to be catched by the
//callee of this method
// unallowed anonymous bind throws 48. But if it throws 48, we
// detected port and TLS, i.e. it is successful.
try {
$settingsFound = $this->connectAndBind($p, $t);
} catch (\Exception $e) {
if($e->getCode() === 48) {
// any reply other than -1 (= cannot connect) is already okay,
// because then we found the server
// unavailable startTLS returns -11
if($e->getCode() > 0) {
$settingsFound = true;
} else {
throw $e;
@ -1084,7 +1085,7 @@ class Wizard extends LDAPUtility {
} else if ($errNo === 2) {
return $this->connectAndBind($port, $tls, true);
}
throw new \Exception($error);
throw new \Exception($error, $errNo);
}
/**