diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/ldap.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e602c1ffafb..7593ad66bfe 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 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 caching it. (ldap-search-internal): Handle ldapsearch error conditions. 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 "\" \"")))))) |