From: Dato Simó <dato@net.com.org.es>
Date: Sun, 6 Oct 2013 17:14:11 +0000 (+0200)
Subject: * net/network-stream.el (network-stream-open-starttls): Don't add
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1369
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3986af6c88f24f5372c916410837a1ead9f948a2;p=emacs.git

* 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.
---

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ó  <dato@net.com.org.es>  (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  <dgutov@yandex.ru>
 
 	* 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.