summaryrefslogtreecommitdiff
path: root/lisp/net/sasl.el
diff options
context:
space:
mode:
authorMagnus Henoch <magnus.henoch@gmail.com>2015-02-23 09:09:46 +0000
committerMagnus Henoch <magnus.henoch@gmail.com>2015-02-23 09:09:46 +0000
commit80e50144d82e271dccd7716703c2f4390463a753 (patch)
tree7f0a938f5210df9cba0f8b494b0008535dd5040c /lisp/net/sasl.el
parent34871865de0452cd251e92d76ab12c2ac237e783 (diff)
downloademacs-80e50144d82e271dccd7716703c2f4390463a753.tar.gz
Fix SCRAM-SHA-1 SASL mechanism
The symbol used in sasl-mechanism-alist needs to match the name that can be required. Move sasl-make-mechanism call to end of file, to ensure that it can refer to the specified step functions. * net/sasl.el (sasl-mechanism-alist): Refer to sasl-scram-rfc instead of sasl-scram-sha-1, as the former is the name that can be required. * net/sasl-scram-rfc.el (sasl-scram-sha-1-steps) (sasl-scram-sha-1-client-final-message) (sasl-scram-sha-1-authenticate-server): Move to end of file.
Diffstat (limited to 'lisp/net/sasl.el')
-rw-r--r--lisp/net/sasl.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/sasl.el b/lisp/net/sasl.el
index e59ed5d43aa..9321efdfda8 100644
--- a/lisp/net/sasl.el
+++ b/lisp/net/sasl.el
@@ -45,7 +45,7 @@
("LOGIN" sasl-login)
("ANONYMOUS" sasl-anonymous)
("NTLM" sasl-ntlm)
- ("SCRAM-SHA-1" sasl-scram-sha-1)))
+ ("SCRAM-SHA-1" sasl-scram-rfc)))
(defvar sasl-unique-id-function #'sasl-unique-id-function)