* elmo-pop3.el (elmo-network-authenticate-session): Abolish

	`elmo-pop3-force-login'.
	Redefine `sasl-mechanisms'.
	* elmo-vars.el (elmo-pop3-force-login): Ditto.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index a330095..8bc29dc 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,12 @@
 2000-11-19  Kenichi OKADA  <okada@opaopa.org>
 
+       * elmo-pop3.el (elmo-network-authenticate-session): Abolish
+       `elmo-pop3-force-login'.
+       Redefine `sasl-mechanisms'.
+       * elmo-vars.el (elmo-pop3-force-login): Ditto.
+
+2000-11-19  Kenichi OKADA  <okada@opaopa.org>
+
        * elmo-imap4.el (toplevel): Delete defun-maybe for sasl-*.
        Delete `elmo-imap4-authenticator-alist'.
        (elmo-imap4-auth-cram-md5): Delete.

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index 30eb8cc..ac5b30c 100644 (file)
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -266,10 +266,10 @@
           sasl-mechanism-alist
           (list '("USER" sasl-pop3-user)
                 '("APOP" sasl-pop3-apop))))
+        (sasl-mechanisms
+         (append sasl-mechanisms (list "USER" "APOP")))
         (mechanism
-         (if (eq auth 'any)
-             (sasl-find-mechanism sasl-mechanisms)
-           (sasl-find-mechanism auth)))
+           (sasl-find-mechanism auth))
         client name step response
         sasl-read-passphrase)
     (unless mechanism