From 515adceaceea8de6e3264f17b2fe24419da10959 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 2 Jul 2012 14:03:16 +0200
Subject: [PATCH] LDAP: reset resource on failed bind

check for resource
---
 apps/user_ldap/lib_ldap.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 21c4e57e29..152977ff7f 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -474,17 +474,16 @@ class OC_LDAP {
 
 		// See if we have a resource
 		$link_resource = self::getConnectionResource();
-		if($link_resource)
-		{
+		if(is_resource($link_resource)) {
 			$sr = ldap_search($link_resource, $base, $filter, $attr);
 			$findings = ldap_get_entries($link_resource, $sr );
+
 			// if we're here, probably no connection resource is returned.
 			// to make ownCloud behave nicely, we simply give back an empty array.
 			if(is_null($findings)) {
 				return array();
 			}
-		} else
-		{
+		} else {
 			// Seems like we didn't find any resource.
 			// Return an empty array just like before.
 			return array();
@@ -690,6 +689,7 @@ class OC_LDAP {
 			$ldapLogin = @ldap_bind(self::$ldapConnectionRes, self::$ldapAgentName, self::$ldapAgentPassword );
 			if(!$ldapLogin) {
 				OCP\Util::writeLog('ldap', 'Bind failed: ' . ldap_errno(self::$ldapConnectionRes) . ': ' . ldap_error(self::$ldapConnectionRes), OCP\Util::ERROR);
+				self::$ldapConnectionRes = null;
 				return false;
 			}
 		}