aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorThomas Fitzsimmons2014-11-13 02:54:13 -0500
committerThomas Fitzsimmons2014-11-13 02:54:13 -0500
commite56e1b924d23a358a14ab069237db35a1c76d6a9 (patch)
tree97409c49fa4bbb127d9be6c0d9f67bba42de6b49 /lisp
parenta6d46519f5a4c07fd31dae6ad71020125b3e4690 (diff)
downloademacs-e56e1b924d23a358a14ab069237db35a1c76d6a9.tar.gz
emacs-e56e1b924d23a358a14ab069237db35a1c76d6a9.zip
Mention binddn in LDAP credentials error message
* net/ldap.el (ldap-search-internal): Mention binddn in invalid credentials error message.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/ldap.el3
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 @@
12014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org> 12014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org>
2 2
3 * net/ldap.el (ldap-search-internal): Mention binddn in invalid
4 credentials error message.
5
62014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org>
7
3 * net/ldap.el (ldap-password-read): Validate password before 8 * net/ldap.el (ldap-password-read): Validate password before
4 caching it. 9 caching it.
5 (ldap-search-internal): Handle ldapsearch error conditions. 10 (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."
667 ;; Handle invalid credentials exit status specially 667 ;; Handle invalid credentials exit status specially
668 ;; for ldap-password-read. 668 ;; for ldap-password-read.
669 (if (eq status 49) 669 (if (eq status 49)
670 (error "Incorrect LDAP password") 670 (error (concat "Incorrect LDAP password or"
671 " bind distinguished name (binddn)"))
671 (error "Failed ldapsearch invocation: %s \"%s\"" 672 (error "Failed ldapsearch invocation: %s \"%s\""
672 ldap-ldapsearch-prog 673 ldap-ldapsearch-prog
673 (mapconcat 'identity proc-args "\" \"")))))) 674 (mapconcat 'identity proc-args "\" \""))))))