From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Wed, 6 Jul 2011 15:09:11 +0000 (+0200)
Subject: * net/network-stream.el (network-stream-open-starttls): Try using
X-Git-Tag: emacs-pretest-24.0.90~104^2~419^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1f2b92cb8733f0aae18088d91e0f440174d3ed83;p=emacs.git

* net/network-stream.el (network-stream-open-starttls): Try using
a plain connection even if the server offered STARTTLS, and we
kinda wanted to use it, if Emacs doesn't have any STARTTLS
capability.  This should make smtpmail.el work in slightly more
configurations.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fb4d94117c6..29c1a1220ab 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* net/network-stream.el (network-stream-open-starttls): Try using
+	a plain connection even if the server offered STARTTLS, and we
+	kinda wanted to use it, if Emacs doesn't have any STARTTLS
+	capability.  This should make smtpmail.el work in slightly more
+	configurations.
+
 2011-07-06  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index effba41c564..038794e117d 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -281,18 +281,14 @@ functionality.
 	      (network-stream-command stream capability-command eo-capa))))
 
     ;; If TLS is mandatory, close the connection if it's unencrypted.
-    (when (and (or require-tls
-		   ;; The server said it was possible to do STARTTLS,
-		   ;; and we wanted to use it...
-		   (and starttls-command
-			(plist-get parameters :use-starttls-if-possible)))
+    (when (and require-tls
 	       ;; ... but Emacs wasn't able to -- either no built-in
 	       ;; support, or no gnutls-cli installed.
 	       (eq resulting-type 'plain))
-	  (setq error
-		(if require-tls
-		    "Server does not support TLS"
-		  "Server supports STARTTLS, but Emacs does not have support for it"))
+      (setq error
+	    (if require-tls
+		"Server does not support TLS"
+	      "Server supports STARTTLS, but Emacs does not have support for it"))
       (delete-process stream)
       (setq stream nil))
     ;; Return value: