From fa533a4a01beb96efb1bbeb35c82f0c18c32d631 Mon Sep 17 00:00:00 2001
From: Zbigniew Szmyd <zbigniew.szmyd@linseco.pl>
Date: Mon, 10 Oct 2016 11:55:12 +0200
Subject: [PATCH] Revert "Correction to work good with the Net_LDAP2 2.2.0"

This reverts commit acbc67ea1c9ad96f75d89129dcf19b045fb16556.
---
 plugins/password/drivers/ldap.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php
index 06c36df27..46c783587 100644
--- a/plugins/password/drivers/ldap.php
+++ b/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 = '';
-        } else {
-            $dn = $result->current()->dn();
+            return '';
         }
-        $ldap->done();
-        
-        return $dn;
+
+        return $result->current()->dn();
     }
 
     /**