* elmo-nntp.el (elmo-network-initialize-session): Accept response 20[01].

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index f1e267b..cbf994b 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-26  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-nntp.el (elmo-network-initialize-session): Accept response 20[01].
+
 2000-11-22  Kenichi OKADA  <okada@opaopa.org>
 
        * elmo-nntp.el (elmo-network-initialize-session): Skip garbage output

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 12f465e..376bf47 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -193,7 +193,7 @@ Don't cache if nil.")
       (while (and (memq (process-status process) '(open run))
                   (goto-char (point-max))
                   (forward-line -1)
-                  (not (looking-at "200")))
+                  (not (looking-at "20[01]")))
         (accept-process-output process 1))
       (setq elmo-nntp-read-point (point))
       (or (elmo-nntp-read-response session t)
@@ -204,8 +204,7 @@ Don't cache if nil.")
        (elmo-nntp-send-command session "starttls")
        (or (elmo-nntp-read-response session)
            (error "Cannot open starttls session"))
-       (starttls-negotiate
-        (elmo-network-session-process-internal session))))))
+       (starttls-negotiate process)))))
 
 (luna-define-method elmo-network-authenticate-session ((session
                                                        elmo-nntp-session))