(open-protocol-stream): All starttls connections are handled by the network handler.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c67cd47..9757ff1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * proto-stream.el (open-protocol-stream): All starttls connections are
+       handled by the network handler.
+
 2010-11-30  Julien Danjou  <julien@danjou.info>
 
        * nnimap.el (nnimap-open-connection-1): Use gnus-string-match-p.

diff --git a/lisp/proto-stream.el b/lisp/proto-stream.el
index 3cbbb98..d402a87 100644 (file)
--- a/lisp/proto-stream.el
+++ b/lisp/proto-stream.el
@@ -96,11 +96,11 @@ is the response to the capaibility command.  It should return nil
 if it turns out that the server doesn't support STARTTLS, or the
 command to switch on STARTTLS otherwise."
   (let ((type (or (cadr (memq :type parameters)) 'network)))
-    (when (and (eq type 'starttls)
-              (fboundp 'open-gnutls-stream))
+    (cond
+     ((eq type 'starttls)
       (setq type 'network))
-    (when (eq type 'ssl)
-      (setq type 'tls))
+     ((eq type 'ssl)
+      (setq type 'tls)))
     (destructuring-bind (stream greeting capabilities)
        (funcall (intern (format "proto-stream-open-%s" type) obarray)
                 name buffer host service parameters)