X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=sasl.el;h=593f46bd1bce44d2b2872e74c92811cec7f60b46;hb=e3697d7a1aa5dd7b573c5ff3f320ed03fd6614bd;hp=6c3ef2faccb3c07aa5260c22db662861104ec550;hpb=cfbeb2aa70dd2506c32ce4a2e1d232731a93701d;p=elisp%2Fflim.git

diff --git a/sasl.el b/sasl.el
index 6c3ef2f..593f46b 100644
--- a/sasl.el
+++ b/sasl.el
@@ -1,6 +1,6 @@
 ;;; sasl.el --- SASL client framework
 
-;; Copyright (C) 2000 Daiki Ueno
+;; Copyright (C) 2000 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: SASL
@@ -37,14 +37,17 @@
 ;;; Code:
 
 (defvar sasl-mechanisms
-  '("CRAM-MD5" "DIGEST-MD5" "PLAIN" "LOGIN" "ANONYMOUS"))
+  '("CRAM-MD5" "DIGEST-MD5" "PLAIN" "LOGIN" "ANONYMOUS"
+    "NTLM" "SCRAM-MD5"))
 
 (defvar sasl-mechanism-alist
   '(("CRAM-MD5" sasl-cram)
     ("DIGEST-MD5" sasl-digest)
     ("PLAIN" sasl-plain)
     ("LOGIN" sasl-login)
-    ("ANONYMOUS" sasl-anonymous)))
+    ("ANONYMOUS" sasl-anonymous)
+    ("NTLM" sasl-ntlm)
+    ("SCRAM-MD5" sasl-scram)))
 
 (defvar sasl-unique-id-function #'sasl-unique-id-function)
 
@@ -235,13 +238,13 @@ It contain at least 64 bits of entropy."
     sasl-login-response-2))
 
 (defun sasl-login-response-1 (client step)
-  (unless (string= (sasl-step-data step) "Username:")
-    (sasl-error (format "Unexpected response: %s" (sasl-step-data step))))
+;;;  (unless (string-match "^Username:" (sasl-step-data step))
+;;;    (sasl-error (format "Unexpected response: %s" (sasl-step-data step))))
   (sasl-client-name client))
 
 (defun sasl-login-response-2 (client step)
-  (unless (string= (sasl-step-data step) "Password:")
-    (sasl-error (format "Unexpected response: %s" (sasl-step-data step))))
+;;;  (unless (string-match "^Password:" (sasl-step-data step))
+;;;    (sasl-error (format "Unexpected response: %s" (sasl-step-data step))))
   (sasl-read-passphrase
    (format "LOGIN passphrase for %s: " (sasl-client-name client))))
 
@@ -252,7 +255,7 @@ It contain at least 64 bits of entropy."
 
 ;;; ANONYMOUS (RFC2245)
 (defconst sasl-anonymous-steps
-  '(identity				;no initial response
+  '(ignore				;no initial response
     sasl-anonymous-response))
 
 (defun sasl-anonymous-response (client step)