From 3986af6c88f24f5372c916410837a1ead9f948a2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Dato=20Sim=C3=B3?= Date: Sun, 6 Oct 2013 19:14:11 +0200 Subject: [PATCH] * net/network-stream.el (network-stream-open-starttls): Don't add --insecure if it's already present, because that gnutls-cli rejects getting that parameter twice. --- lisp/ChangeLog | 6 ++++++ lisp/net/network-stream.el | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5a496908af7..94b10ac97f5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-10-06 Dato Simó (tiny change) + + * net/network-stream.el (network-stream-open-starttls): Don't add + --insecure if it's already present, because that gnutls-cli + rejects getting that parameter twice. + 2013-10-06 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure' diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index ab7d02cc802..062593a7b8c 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -242,7 +242,8 @@ a greeting from the server. (delete-process stream) (setq start (with-current-buffer buffer (point-max))) (let* ((starttls-extra-arguments - (if require-tls + (if (or require-tls + (member "--insecure" starttls-extra-arguments)) starttls-extra-arguments ;; For opportunistic TLS upgrades, we don't really ;; care about the identity of the peer. -- 2.39.2