fix

diff --git a/ChangeLog b/ChangeLog
index 6cd95c0..b33a854 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-07   Kenichi OKADA  <okada@opaopa.org>
+
+       * sasl.el (sasl-login-response-1): Fix.
+       (sasl-login-response-2): Fix.
+
 2000-11-07   Daiki Ueno  <ueno@unixuser.org>
 
        * smtp.el (smtp-sasl-properties): New user option.

diff --git a/sasl.el b/sasl.el
index 6c3ef2f..86187c9 100644 (file)
--- a/sasl.el
+++ b/sasl.el
@@ -235,12 +235,12 @@ 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:")
+  (unless (string-match "^user ?name." (sasl-step-data step)) ;; XXX
     (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:")
+  (unless (string-match "^password." (sasl-step-data step))  ;; XXX
     (sasl-error (format "Unexpected response: %s" (sasl-step-data step))))
   (sasl-read-passphrase
    (format "LOGIN passphrase for %s: " (sasl-client-name client))))