diff options
author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-27 02:11:22 +0200 |
---|---|---|
committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-06-27 02:11:22 +0200 |
commit | f6ab314e6ed2e3ad335fde222e6b649ead481040 (patch) | |
tree | 3bbdbd1b6ae3a464e6a917e4afd1674a077a522c /lisp/net | |
parent | 40098786b578185966883d38b8448ff01a6da656 (diff) | |
download | emacs-f6ab314e6ed2e3ad335fde222e6b649ead481040.tar.gz |
Fix stupid typo with gnutls-clii.
Don't re-get capabilities unless we're reconnecting.
Diffstat (limited to 'lisp/net')
-rw-r--r-- | lisp/net/network-stream.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 502d77500ab..a8989398e15 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -223,7 +223,7 @@ functionality. (or builtin-starttls (and (or require-tls (plist-get parameters :use-starttls-if-possible)) - (executable-find "gnutls-clii"))) + (executable-find "gnutls-cli"))) (not (eq (plist-get parameters :type) 'plain))) ;; If using external STARTTLS, drop this connection and start ;; anew with `starttls-open-stream'. @@ -246,11 +246,11 @@ functionality. "--x509certfile" (expand-file-name (nth 1 cert))) starttls-extra-arguments))) (setq stream (starttls-open-stream name buffer host service))) - (network-stream-get-response stream start eoc)) - ;; Requery capabilities for protocols that require it; i.e., - ;; EHLO for SMTP. - (when (plist-get parameters :always-query-capabilities) - (network-stream-command stream capability-command eoc)) + (network-stream-get-response stream start eoc) + ;; Requery capabilities for protocols that require it; i.e., + ;; EHLO for SMTP. + (when (plist-get parameters :always-query-capabilities) + (network-stream-command stream capability-command eoc))) (when (string-match success-string (network-stream-command stream starttls-command eoc)) ;; The server said it was OK to begin STARTTLS negotiations. |