summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Pluim <rpluim@gmail.com>2019-09-04 23:43:56 +0200
committerRobert Pluim <rpluim@gmail.com>2019-09-04 23:46:31 +0200
commitfc9ed61a4357f766292d157ad89e0c1ffb1fa1e2 (patch)
tree7c45ff44f893ab2d41372c01fabd6d409dcd8948
parentd607067dd7d54f65f3f0453f4319de17788b60c1 (diff)
downloademacs-fc9ed61a4357f766292d157ad89e0c1ffb1fa1e2.tar.gz
emacs-fc9ed61a4357f766292d157ad89e0c1ffb1fa1e2.tar.bz2
emacs-fc9ed61a4357f766292d157ad89e0c1ffb1fa1e2.zip
Fix nsm for unencrypted connections
When connecting using a cleartext connection, nsm was erroring out and tearing down the connection because it was trying to display nonexistent certificate information. * lisp/net/nsm.el (nsm-query-user): Only format certificate status when it is valid. (Bug#37221)
-rw-r--r--lisp/net/nsm.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/nsm.el b/lisp/net/nsm.el
index 5e8381075be..8750c19267a 100644
--- a/lisp/net/nsm.el
+++ b/lisp/net/nsm.el
@@ -823,7 +823,7 @@ protocol."
;; First format the certificate and warnings.
(with-current-buffer-window
buffer nil nil
- (insert (nsm-format-certificate status))
+ (when status (insert (nsm-format-certificate status)))
(insert message)
(goto-char (point-min))
;; Fill the first line of the message, which usually