diff options
| author | Lars Magne Ingebrigtsen | 2016-04-24 15:39:44 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2016-04-24 15:39:44 +0200 |
| commit | 04355ac0595cde56af485b5ebebe246d7d96d762 (patch) | |
| tree | 94b0651f0c0ae3664a2102bca5320b15510f6524 | |
| parent | 331f4a638150c1ab8ae5bea86b901f32263b9192 (diff) | |
| download | emacs-04355ac0595cde56af485b5ebebe246d7d96d762.tar.gz emacs-04355ac0595cde56af485b5ebebe246d7d96d762.zip | |
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).
| -rw-r--r-- | lisp/net/network-stream.el | 3 |
1 files changed, 3 insertions, 0 deletions
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')." | |||
| 312 | :host (puny-encode-domain host) | 312 | :host (puny-encode-domain host) |
| 313 | :service service)) | 313 | :service service)) |
| 314 | (network-stream-get-response stream start eoc))) | 314 | (network-stream-get-response stream start eoc))) |
| 315 | (unless (process-live-p stream) | ||
| 316 | (error "Unable to negotiate a TLS connection with %s/%s" | ||
| 317 | host service)) | ||
| 315 | ;; Re-get the capabilities, which may have now changed. | 318 | ;; Re-get the capabilities, which may have now changed. |
| 316 | (setq capabilities | 319 | (setq capabilities |
| 317 | (network-stream-command stream capability-command eo-capa)))) | 320 | (network-stream-command stream capability-command eo-capa)))) |