summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Schiwon <blizzz@owncloud.com>2013-05-25 11:03:58 +0200
committerArthur Schiwon <blizzz@owncloud.com>2013-05-31 20:13:33 +0200
commit7b95d031a1e97dca7fc04ae5ed0b6e655522a96b (patch)
tree1546108e3cd87dc2f227e992cc61a2786888b4d1
parent78520cdfc7bfc4a5ebdce1a72d83b8e65ee6e608 (diff)
downloadnextcloud-server-7b95d031a1e97dca7fc04ae5ed0b6e655522a96b.tar.gz
nextcloud-server-7b95d031a1e97dca7fc04ae5ed0b6e655522a96b.zip
LDAP: fix possible recursion
-rw-r--r--apps/user_ldap/lib/connection.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 24ee80fbbf8..a2a4776de6f 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -635,10 +635,17 @@ class Connection {
* Binds to LDAP
*/
public function bind() {
+ static $getConnectionResourceAttempt = false;
if(!$this->config['ldapConfigurationActive']) {
return false;
}
+ if($getConnectionResourceAttempt) {
+ $getConnectionResourceAttempt = false;
+ return false;
+ }
+ $getConnectionResourceAttempt = true;
$cr = $this->getConnectionResource();
+ $getConnectionResourceAttempt = false;
if(!is_resource($cr)) {
return false;
}