sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10227 from nextcloud/bugfix/10160/ldap-bind-loop 

Only bind to ldap if configuration for the first server is set
pull/10237/merge
Morris Jobke 2018-07-13 15:12:34 +07:00 committed by GitHub
parent f2b92c44a3 858bd67eff
commit 0343d59c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/user_ldap/lib/Connection.php
Unescape Escape View File

@ -576,8 +576,8 @@ class Connection extends LDAPUtility {
if (!$isOverrideMainServer) {
$this->doConnect($this->configuration->ldapHost,
$this->configuration->ldapPort);
return $this->bind();
}
return $this->bind();
} catch (ServerNotAvailableException $e) {
if(!$isBackupHost) {
throw $e;

4
apps/user_ldap/tests/ConnectionTest.php
Unescape Escape View File

@ -110,7 +110,7 @@ class ConnectionTest extends \Test\TestCase {
->method('setOption')
->will($this->returnValue(true));
$this->ldap->expects($this->exactly(2))
$this->ldap->expects($this->exactly(3))
->method('connect')
->will($this->returnValue('ldapResource'));
@ -119,7 +119,7 @@ class ConnectionTest extends \Test\TestCase {
->will($this->returnValue(0));
// Not called often enough? Then, the fallback to the backup server is broken.
$this->connection->expects($this->exactly(3))
$this->connection->expects($this->exactly(4))
->method('getFromCache')
->with('overrideMainServer')
->will($this->onConsecutiveCalls(false, false, true, true));