Merge branch 'master' of github.com:roundcube/roundcubemail

8 years ago · bf3b07aeef
parent 7abfe41ab7 317372f046
commit bf3b07aeef
1 changed files with 4 additions and 2 deletions
--- a/plugins/password/drivers/ldap.php
+++ b/plugins/password/drivers/ldap.php
@ -187,12 +187,14 @@ class rcube_ldap_password
        );

        $result = $ldap->search($base, $filter, $options);
-        $ldap->done();
        if (is_a($result, 'PEAR_Error') || ($result->count() != 1)) {
+            $ldap->done();
            return '';
        }
+        $userDN = $result->current()->dn();
+        $ldap->done();

-        return $result->current()->dn();
+        return $userDN;
    }

    /**