diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-05 09:48:13 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-05 09:48:13 +0200 |
| commit | 09fe808d485c7b16c175d945e78425b85c0ba81c (patch) | |
| tree | bebd59b2fa69e662ef029fd47535aa82f9dfaeeb | |
| parent | 11574eaa90c1114a040af6154e578da5265dccf9 (diff) | |
| parent | 6d06d1c5a4525696997c4d1d7d1d225895630fdb (diff) | |
| download | nextcloud-server-09fe808d485c7b16c175d945e78425b85c0ba81c.tar.gz nextcloud-server-09fe808d485c7b16c175d945e78425b85c0ba81c.zip | |
Merge pull request #19547 from owncloud/fix-16154
LDAP Wizard: do not be picky about credentials when only looking for …
| -rw-r--r-- | apps/user_ldap/lib/wizard.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php index 13ccf805b69..8d96e7de91d 100644 --- a/apps/user_ldap/lib/wizard.php +++ b/apps/user_ldap/lib/wizard.php @@ -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); } /** |