Mention binddn in LDAP credentials error message

* net/ldap.el (ldap-search-internal): Mention binddn in invalid
credentials error message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e602c1ffafb76adb98a5660e8408f93fe3711e01..7593ad66bfe94a987e354cb2d85772eb35e57c5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+       * net/ldap.el (ldap-search-internal): Mention binddn in invalid
+       credentials error message.
+
 2014-11-13  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
        * net/ldap.el (ldap-password-read): Validate password before

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index dfa66f15008a3d2a9d05e843365dd214f1640971..fb425b33dfd5bc78c9c82a8c243fa2ac28744f4d 100644 (file)
--- 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 "\" \""))))))