(open-network-stream): Add the keyword :always-query-capabilities.

This is for the case where you want to force a `plain' network
connection, but the protocol still requires the capabilitiy command
(i.e., SMTP and EHLO).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ee020f33c55e04cf44569e1cb3cb3bdd0cedff0..d2d4479336676c8a8449b12f3b371ce3101d91fa 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -14,6 +14,11 @@
 
 2011-06-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * net/network-stream.el (open-network-stream): Add the keyword
+       :always-query-capabilities for the case where you want to force a
+       `plain' network connection, but the protocol still requires the
+       capabilitiy command (i.e., SMTP and EHLO).
+
        * subr.el (process-live-p): Rename from `process-alive-p' for
        consistency with other `-live-p' functions.
 

diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 61e4630906dd8d134c9dda5b91ccabfd0d4bc68c..b17b9ae805c4afecf9d5cc805a6c54f56b4be22d 100644 (file)
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -109,6 +109,9 @@ values:
   capability command, and should return the command to switch on
   STARTTLS if the server supports STARTTLS, and nil otherwise.
 
+:always-query-capabilies says whether to query the server for
+capabilities, even if we're doing a `plain' network connection.
+
 :nowait is a boolean that says the connection should be made
 asynchronously, if possible."
   (unless (featurep 'make-network-process)
@@ -126,8 +129,11 @@ asynchronously, if possible."
                              :nowait (plist-get parameters :nowait))
       (let ((work-buffer (or buffer
                             (generate-new-buffer " *stream buffer*")))
-           (fun (cond ((eq type 'plain) 'network-stream-open-plain)
-                      ((memq type '(nil network starttls))
+           (fun (cond ((and (eq type 'plain)
+                            (not (plist-get parameters
+                                            :always-query-capabilities)))
+                       'network-stream-open-plain)
+                      ((memq type '(nil network starttls plain))
                        'network-stream-open-starttls)
                       ((memq type '(tls ssl)) 'network-stream-open-tls)
                       ((eq type 'shell) 'network-stream-open-shell)
@@ -182,7 +188,8 @@ asynchronously, if possible."
                        (executable-find "gnutls-cli")))
               capabilities success-string starttls-function
               (setq starttls-command
-                    (funcall starttls-function capabilities)))
+                    (funcall starttls-function capabilities))
+              (not (eq (plist-get parameters :type) 'plain)))
       ;; If using external STARTTLS, drop this connection and start
       ;; anew with `starttls-open-stream'.
       (unless (fboundp 'open-gnutls-stream)