From: okada <okada>
Date: Tue, 20 Feb 2001 09:55:13 +0000 (+0000)
Subject: * elmo-imap4.el (elmo-network-authenticate-session): Fix.
X-Git-Tag: wl-2_6-root~94
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fda2f6227f8f07c75d04d1bef99e3c5c63be97c3;p=elisp%2Fwanderlust.git

* elmo-imap4.el (elmo-network-authenticate-session): Fix.
* elmo-pop3.el (elmo-network-authenticate-session): Add comments.
---

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 9f797cb..c56555b 100644
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,5 +1,10 @@
 2000-02-20  Kenichi OKADA  <okada@opaopa.org>
 
+	* elmo-imap4.el (elmo-network-authenticate-session): Fix.
+	* elmo-pop3.el (elmo-network-authenticate-session): Add comments.
+
+2000-02-20  Kenichi OKADA  <okada@opaopa.org>
+
 	* elmo-imap4.el (elmo-imap4-list-folder): Added 'uid'
 
 2000-02-19  Kenichi OKADA  <okada@opaopa.org>
@@ -7,16 +12,16 @@
 	* elmo2.el (elmo-list-folder): Added optional argument `nohide'.
 	* elmo-imap4.el (elmo-imap4-list-folder): Added optional argument `nohide'.
 	* elmo-pop3.el (elmo-pop3-list-folder): Ditto.
-    	* elmo-nntp.el (elmo-nntp-list-folder): Ditto.
+	* elmo-nntp.el (elmo-nntp-list-folder): Ditto.
 	* elmo-localdir.el (elmo-localdir-list-folder): Ditto.
 	* elmo-localnews.el (elmo-localnews-list-folder): Ditto.
 	* elmo-archive.el (elmo-archive-list-folder): Ditto.
-    	* elmo-filter.el (elmo-filter-list-folder): Ditto.
+	* elmo-filter.el (elmo-filter-list-folder): Ditto.
 	* elmo-internal.el (elmo-internal-list-folder): Ditto.
-    	* elmo-pipe.el (elmo-pipe-list-folder): Ditto.
-    	* elmo-multi.el (elmo-multi-list-folder): Ditto.
-    	* elmo-maildir.el (elmo-maildir-list-folder): Ditto.
-    	* elmo-dop.el (elmo-dop-list-folder): Ditto.
+	* elmo-pipe.el (elmo-pipe-list-folder): Ditto.
+	* elmo-multi.el (elmo-multi-list-folder): Ditto.
+	* elmo-maildir.el (elmo-maildir-list-folder): Ditto.
+	* elmo-dop.el (elmo-dop-list-folder): Ditto.
 
 2000-02-17  Kenichi OKADA  <okada@opaopa.org>
 
diff --git a/elmo/elmo-imap4.el b/elmo/elmo-imap4.el
index 0706591..c4c6139 100644
--- a/elmo/elmo-imap4.el
+++ b/elmo/elmo-imap4.el
@@ -1279,31 +1279,31 @@ If optional argument UNMARK is non-nil, unmark."
 		   session
 		   (concat "AUTHENTICATE " name
 			   (and (sasl-step-data step)
-				(concat 
+				(concat
 				 " "
 				 (elmo-base64-encode-string
 				  (sasl-step-data step)
-				  'no-lin-break)))))) ;)
+				  'no-lin-break))))))
 	    (catch 'done
 	      (while t
 		(setq response
 		      (elmo-imap4-read-untagged
 		       (elmo-network-session-process-internal session)))
-		(if (elmo-imap4-response-continue-req-p response)
-		    (unless (sasl-next-step client step)
-		      ;; response is '+' but there's no next step.
-		      (signal 'elmo-authenticate-error
-			      (list (intern
-				     (concat "elmo-imap4-auth-"
-					     (downcase name))))))
-		  ;; response is OK.
-		  (if (elmo-imap4-response-ok-p response)
-		      (throw 'done nil) ; finished.
-		    ;; response is NO or BAD.
-		    (signal 'elmo-authenticate-error
-			    (list (intern
-				   (concat "elmo-imap4-auth-"
-					   (downcase name)))))))
+		(if (elmo-imap4-response-ok-p response)
+		    (if (sasl-next-step client step)
+			;; Bogus server?
+			(signal 'elmo-authenticate-error
+				(list (intern
+				       (concat "elmo-imap4-auth-"
+					       (downcase name)))))
+		      ;; The authentication process is finished.
+		      (throw 'done nil)))
+		(unless (elmo-imap4-response-continue-req-p response)
+		  ;; response is NO or BAD.
+		  (signal 'elmo-authenticate-error
+			  (list (intern
+				 (concat "elmo-imap4-auth-"
+					 (downcase name))))))
 		(sasl-step-set-data
 		 step
 		 (elmo-base64-decode-string
diff --git a/elmo/elmo-pop3.el b/elmo/elmo-pop3.el
index fa0b4a8..d92cb70 100644
--- a/elmo/elmo-pop3.el
+++ b/elmo/elmo-pop3.el
@@ -265,16 +265,19 @@
 	    (catch 'done
 	      (while t
 		(unless (setq response (elmo-pop3-read-response process t))
+		  ;; response is NO or BAD.
 		  (signal 'elmo-authenticate-error
 			  (list (intern
 				 (concat "elmo-pop3-auth-"
 					 (downcase name))))))
 		(if (string-match "^\+OK" response)
 		    (if (sasl-next-step client step)
+			;; Bogus server?
 			(signal 'elmo-authenticate-error
 				(list (intern
 				       (concat "elmo-pop3-auth-"
 					       (downcase name)))))
+		      ;; The authentication process is finished.
 		      (throw 'done nil)))
 		(sasl-step-set-data
 		 step