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

LDAP: fix handling when LDAP Host is offline

This commit is contained in:
Arthur Schiwon 2013-05-25 11:02:51 +02:00
parent 698862519d
commit bfa715768a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/user_ldap/lib/connection.php
View File

@ -601,14 +601,13 @@ class Connection {
$error = null; $error = null;
} }
$error = null;
//if LDAP server is not reachable, try the Backup (Replica!) Server //if LDAP server is not reachable, try the Backup (Replica!) Server
if((!$bindStatus && ($error === -1)) if((!$bindStatus && ($error !== 0))
|| $this->config['ldapOverrideMainServer'] || $this->config['ldapOverrideMainServer']
|| $this->getFromCache('overrideMainServer')) { || $this->getFromCache('overrideMainServer')) {
$this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']); $this->doConnect($this->config['ldapBackupHost'], $this->config['ldapBackupPort']);
$bindStatus = $this->bind(); $bindStatus = $this->bind();
if($bindStatus && $error === -1) { if(!$bindStatus && $error === -1) {
//when bind to backup server succeeded and failed to main server, //when bind to backup server succeeded and failed to main server,
//skip contacting him until next cache refresh //skip contacting him until next cache refresh
$this->writeToCache('overrideMainServer', true); $this->writeToCache('overrideMainServer', true);