From: okada <okada>
Date: Fri, 16 Feb 2001 23:14:12 +0000 (+0000)
Subject: fix
X-Git-Tag: wl-2_6-root~116
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31199040b3961a98126bb6a4a7a41b9b54a823cb;p=elisp%2Fwanderlust.git

fix
---

diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index cef5d97..59201f6 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -44,6 +44,7 @@
   "*If non-nil, use UIDL.")
 
 (defvar elmo-pop3-exists-exactly t)
+(defvar sasl-mechanism-alist)
 
 (luna-define-class elmo-pop3-session (elmo-network-session))
 
@@ -223,7 +224,7 @@
 	   (auth (elmo-network-session-auth-internal session))
 	   (auth (mapcar '(lambda (mechanism) (upcase (symbol-name mechanism)))
 			 (if (listp auth) auth (list auth))))
-	   (sasl-mechanisms (mapcar 'car sasl-mechanism-alist))
+	   sasl-mechanisms
 	   client name step response mechanism
 	   sasl-read-passphrase)
       (or (and (string= "USER" (car auth))
@@ -231,6 +232,8 @@
 	  (and (string= "APOP" (car auth))
 	       (elmo-pop3-auth-apop session))
 	  (progn
+	    (require 'sasl)
+	    (setq sasl-mechanisms (mapcar 'car sasl-mechanism-alist))
 	    (setq mechanism (sasl-find-mechanism auth))
 	    (unless mechanism
 	      (signal 'elmo-authenticate-error '(elmo-pop3-auth-no-mechanisms)))