From: Robert Pluim <rpluim@gmail.com>
Date: Wed, 4 Sep 2019 21:43:56 +0000 (+0200)
Subject: Fix nsm for unencrypted connections
X-Git-Tag: emacs-27.0.90~1553^2~33
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fc9ed61a4357f766292d157ad89e0c1ffb1fa1e2;p=emacs.git

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)
---

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