Commit 3986af6c authored by Dato Simó's avatar Dato Simó Committed by Lars Magne Ingebrigtsen
Browse files

* 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.
parent a3e9050c
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> 2013-10-06 Dmitry Gutov <dgutov@yandex.ru>
* progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure' * progmodes/ruby-mode.el (ruby-smie-rules): Dedent `ensure'
......
...@@ -242,7 +242,8 @@ a greeting from the server. ...@@ -242,7 +242,8 @@ a greeting from the server.
(delete-process stream) (delete-process stream)
(setq start (with-current-buffer buffer (point-max))) (setq start (with-current-buffer buffer (point-max)))
(let* ((starttls-extra-arguments (let* ((starttls-extra-arguments
(if require-tls (if (or require-tls
(member "--insecure" starttls-extra-arguments))
starttls-extra-arguments starttls-extra-arguments
;; For opportunistic TLS upgrades, we don't really ;; For opportunistic TLS upgrades, we don't really
;; care about the identity of the peer. ;; care about the identity of the peer.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment