From 25418856edb4887cac7806207885cb267452ad0e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 5 Jan 2016 20:31:43 -0200
Subject: [PATCH] Fix #1491 via code from @miscs
---
packages/rocketchat-ldap/ldap_server.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/packages/rocketchat-ldap/ldap_server.js b/packages/rocketchat-ldap/ldap_server.js
index 1e6589c3d55..197c21a9f98 100644
--- a/packages/rocketchat-ldap/ldap_server.js
+++ b/packages/rocketchat-ldap/ldap_server.js
@@ -162,8 +162,10 @@ LDAP.prototype.ldapCheck = function(options) {
error: err
});
}
+ var entryCount = 0;
var dn = self.options.dn;
res.on('searchEntry', function(entry) {
+ entryCount++;
dn = entry.object.dn;
});
res.on('error', function(err) {
@@ -173,7 +175,15 @@ LDAP.prototype.ldapCheck = function(options) {
});
});
res.on('end', function(result) {
- bind(dn);
+ if (entryCount === 1) {
+ bind(dn);
+ } else {
+ console.log('LDAP: Search returned', entryCount, 'record(s)');
+ var err = new Error('User not Found');
+ ldapAsyncFut.return({
+ error: err
+ });
+ }
});
});
} catch (e) {
--
GitLab