[Emacs-diffs] master e56e1b9 16/17: Mention binddn in LDAP credentials error message

[Stefan Monnier]

branch: master
commit e56e1b924d23a358a14ab069237db35a1c76d6a9
Author: Thomas Fitzsimmons <address@hidden>
Commit: Thomas Fitzsimmons <address@hidden>

    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 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e602c1f..7593ad6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2014-11-13  Thomas Fitzsimmons  <address@hidden>
 
+       * net/ldap.el (ldap-search-internal): Mention binddn in invalid
+       credentials error message.
+
+2014-11-13  Thomas Fitzsimmons  <address@hidden>
+
        * net/ldap.el (ldap-password-read): Validate password before
        caching it.
        (ldap-search-internal): Handle ldapsearch error conditions.
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index dfa66f1..fb425b3 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 "\" \""))))))