From e56e1b924d23a358a14ab069237db35a1c76d6a9 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Thu, 13 Nov 2014 02:54:13 -0500 Subject: [PATCH] Mention binddn in LDAP credentials error message * net/ldap.el (ldap-search-internal): Mention binddn in invalid credentials error message. --- lisp/ChangeLog | 5 +++++ lisp/net/ldap.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e602c1ffafb..7593ad66bfe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-11-13 Thomas Fitzsimmons + + * net/ldap.el (ldap-search-internal): Mention binddn in invalid + credentials error message. + 2014-11-13 Thomas Fitzsimmons * net/ldap.el (ldap-password-read): Validate password before diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el index dfa66f15008..fb425b33dfd 100644 --- a/lisp/net/ldap.el +++ b/lisp/net/ldap.el @@ -667,7 +667,8 @@ an alist of attribute/value pairs." ;; Handle invalid credentials exit status specially ;; for ldap-password-read. (if (eq status 49) - (error "Incorrect LDAP password") + (error (concat "Incorrect LDAP password or" + " bind distinguished name (binddn)")) (error "Failed ldapsearch invocation: %s \"%s\"" ldap-ldapsearch-prog (mapconcat 'identity proc-args "\" \"")))))) -- 2.39.5