* elmo-imap4.el (elmo-imap4-clear-login): Don't send LOGIN command

when the LOGINDISABLED capability is advertised.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index f57d16f..42f4cf1 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-12  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * elmo-imap4.el (elmo-imap4-clear-login): Don't send LOGIN command
+       when the LOGINDISABLED capability is advertised.
+
 2007-01-27  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * elmo-msgdb.el (elmo-msgdb-extra-fields): Make it non-destructive.

diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index b8d850a..11804c8 100644 (file)
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -937,6 +937,8 @@ If CHOP-LENGTH is not specified, message set is not chopped."
        (concat "(" (downcase (elmo-match-string 1 string)) ")"))))
 
 (defun elmo-imap4-clear-login (session)
+  (when (elmo-imap4-session-capable-p session 'logindisabled)
+    (signal 'elmo-authenticate-error '(elmo-imap4-clear-login)))
   (let ((elmo-imap4-debug-inhibit-logging t))
     (or
      (elmo-imap4-read-ok