Revert "Correction to work good with the Net_LDAP2 2.2.0"

This reverts commit acbc67ea1c.

plugins/password/drivers/ldap.php

@@ -187,14 +187,12 @@ class rcube_ldap_password
         );
 
         $result = $ldap->search($base, $filter, $options);
+        $ldap->done();
         if (is_a($result, 'PEAR_Error') || ($result->count() != 1)) {
-            $dn = '';
+            return '';
-        } else {
-            $dn = $result->current()->dn();
         }
-        $ldap->done();
 
-        return $dn;
+        return $result->current()->dn();
     }
 
     /**