master acfbace: Make setting verify-hostname-error not make connections fail

[Lars Ingebrigtsen]

branch: master
commit acfbacefc468244911455fe6cd2abeabfddff312
Author: Robert Pluim <rpluim@gmail.com>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Make setting verify-hostname-error not make connections fail
    
    * lisp/net/gnutls.el (gnutls-boot-parameters): If
    verify-hostname-error was set, this would make verify-error a
    non-proper list (bug#38602).
---
 lisp/net/gnutls.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index e713c94..8ad7219 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -348,8 +348,11 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
                             (t nil))))
          (min-prime-bits (or min-prime-bits gnutls-min-prime-bits)))
 
-    (when verify-hostname-error
-      (push :hostname verify-error))
+    ;; Only add :hostname if `verify-error' is not t, since t
+    ;; means "include :hostname" Bug#38602.
+    (and verify-hostname-error
+         (not (eq verify-error t))
+         (push :hostname verify-error))
 
     `(:priority ,priority-string
                 :hostname ,hostname