From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 24 Apr 2016 13:39:44 +0000 (+0200)
Subject: Make STARTTLS error messages better
X-Git-Tag: emacs-26.0.90~2169
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04355ac0595cde56af485b5ebebe246d7d96d762;p=emacs.git

Make STARTTLS error messages better

* lisp/net/network-stream.el (network-stream-open-starttls):
Output a better error message when TLS negotiation fails while
doing STARTTLS (bug#23027).
---

diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 5ddaef58a89..c2845d96a5d 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -312,6 +312,9 @@ gnutls-boot (as returned by `gnutls-boot-parameters')."
 					:host (puny-encode-domain host)
                                         :service service))
 	    (network-stream-get-response stream start eoc)))
+        (unless (process-live-p stream)
+          (error "Unable to negotiate a TLS connection with %s/%s"
+                 host service))
 	;; Re-get the capabilities, which may have now changed.
 	(setq capabilities
 	      (network-stream-command stream capability-command eo-capa))))