* 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 5a496908af778ee855e66bf40eac6b1751943773..94b10ac97f5d0f2a2b5896b1b34a5f00567ea144 100644 (file)
--- 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 ab7d02cc80224c003c322d03c0867d07450bbf1c..062593a7b8cb054002645b36ccec35bc15f8e764 100644 (file)
--- 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.