LDAP: reset resource on failed bind

check for resource

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 21c4e57e2933eacbbd2763a6c6995989b09fddcd..152977ff7f76f2509bacc431b491ebef52195435 100644 (file)
--- 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;
                        }
                }