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

on clone Connection, do not take over the existing LDAP resource 

For one, it solves potential conflicts when using the resource. For the
other, one on the login check (the only place where a clone happens
currently) we do not need to rebind after confirming the user's login
was successful.
This commit is contained in:
Arthur Schiwon 2016-04-22 21:43:41 +02:00
parent 57b9ae18f0
commit 8ebde1e74d
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/user_ldap/lib/access.php
View File

@ -1295,9 +1295,7 @@ class Access extends LDAPUtility implements user\IUserTools {
if(!$testConnection->setConfiguration($credentials)) {
return false;
}
$result=$testConnection->bind();
$this->ldap->unbind($this->connection->getConnectionResource());
return $result;
return $testConnection->bind();
}
/**

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

@ -47,9 +47,6 @@ class Connection extends LDAPUtility {
private $configPrefix;
private $configID;
private $configured = false;
//whether connection should be kept on __destruct
private $dontDestruct = false;
private $hasPagedResultSupport = true;
/**
@ -91,8 +88,7 @@ class Connection extends LDAPUtility {
}
public function __destruct() {
if(!$this->dontDestruct &&
$this->ldap->isResource($this->ldapConnectionRes)) {
if($this->ldap->isResource($this->ldapConnectionRes)) {
@$this->ldap->unbind($this->ldapConnectionRes);
};
}
@ -101,11 +97,9 @@ class Connection extends LDAPUtility {
* defines behaviour when the instance is cloned
*/
public function __clone() {
//a cloned instance inherits the connection resource. It may use it,
//but it may not disconnect it
$this->dontDestruct = true;
$this->configuration = new Configuration($this->configPrefix,
!is_null($this->configID));
$this->ldapConnectionRes = null;
}
/**