From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 27 Jun 2011 00:11:22 +0000 (+0200)
Subject: Fix stupid typo with gnutls-clii.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~379
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f6ab314e6ed2e3ad335fde222e6b649ead481040;p=emacs.git

Fix stupid typo with gnutls-clii.
Don't re-get capabilities unless we're reconnecting.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 294a22f40f8..872b4945837 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* net/network-stream.el (network-stream-open-starttls): Don't
+	re-get capabilities unless we've reestablished connection.
+	(network-stream-open-starttls): Fix stupid typo with gnutls-clii.
+
 	* mail/smtpmail.el (smtpmail-via-smtp): Bind coding-system-for-*
 	to binary to possibly avoid line encoding issues on Windows (among
 	other things).
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.