* elmo-nntp.el (elmo-network-initialize-session):

	Add starttls negotiation.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index 66ab26c..e5e0b84 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-15  Kenichi OKADA  <okada@opaopa.org>
+
+       * elmo-nntp.el (elmo-network-initialize-session):
+       Add starttls negotiation.
+
 2000-10-15  Masahiro MURATA  <muse@ba2.so-net.ne.jp>
 
        * elmo-nntp.el (elmo-network-initialize-session): Read greeting

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index c6e6f72..01792c1 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -185,7 +185,15 @@ Don't cache if nil.")
   (with-current-buffer (elmo-network-session-buffer session)
     (setq elmo-nntp-read-point (point-min))
     (or (elmo-nntp-read-response session t)
-       (error "cannot open network"))))
+       (error "cannot open network"))
+    (when (eq (elmo-network-stream-type-symbol
+              (elmo-network-session-stream-type-internal session))
+             'starttls)
+      (elmo-nntp-send-command session "starttls")
+      (or (elmo-nntp-read-response session)
+         (error "cannot open starttls session"))
+      (starttls-negotiate process))))
+
 
 (luna-define-method elmo-network-authenticate-session ((session
                                                        elmo-nntp-session))