wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login

Browse source 
on clone Connection, do not take over the existing LDAP resource
This commit is contained in:
Vincent Petry 2016-04-25 12:38:09 +02:00
commit 7a22e3f083
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

@ -49,9 +49,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;
/**
@ -94,8 +91,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);
};
}
@ -104,11 +100,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;
}
/**