From bf3b07aeefb798b29fa98732d3f1511faff05683 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Sun, 24 Apr 2016 05:13:05 -0400 Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail --- plugins/password/drivers/ldap.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index 46c7835..c605242 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -187,12 +187,14 @@ ); $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; } /** -- Gitblit v1.9.1