* wl-draft.el (wl-smtp-extension-bind): Support smtp over ssl.

* wl-vars.el (wl-smtp-connection-type): Ditto.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 8bed06a..b5c5d5a 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-03  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * wl-draft.el (wl-smtp-extension-bind): Support smtp over ssl.
+       * wl-vars.el (wl-smtp-connection-type): Ditto.
+
 2004-04-03  Colin Rafferty  <colin.rafferty@morganstanley.com>
 
        * wl-highlight.el (wl-highlight-message): Change to strict regexp

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 58ea817..dc85df3 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -53,6 +53,8 @@
 (eval-and-compile
   (autoload 'wl-addrmgr "wl-addrmgr"))
 
+(autoload 'open-ssl-stream "ssl")
+
 (defvar wl-draft-buffer-message-number nil)
 (defvar wl-draft-field-completion-list nil)
 (defvar wl-draft-verbose-send t)
@@ -136,6 +138,14 @@ e.g.
                           (list wl-smtp-authenticate-type)))))
            (smtp-use-sasl (and smtp-sasl-mechanisms t))
            (smtp-use-starttls (eq wl-smtp-connection-type 'starttls))
+           (smtp-open-connection-function
+            (if (eq wl-smtp-connection-type 'ssl)
+                #'open-ssl-stream
+              smtp-open-connection-function))
+           (smtp-end-of-line
+            (if (eq wl-smtp-connection-type 'ssl)
+                "\n"
+              smtp-end-of-line))
            smtp-sasl-user-name smtp-sasl-properties sasl-read-passphrase)
        (if (and (string= (car smtp-sasl-mechanisms) "DIGEST-MD5")
                ;; sendmail bug?

diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 96948ac..5d72a65 100644 (file)
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -540,6 +540,7 @@ references field of the current draft."
 If nil, default smtp connection type is used."
   :type '(choice (const :tag "default" nil)
                 (const :tag "Use STARTTLS" starttls)
+                (const :tag "SMTP over SSL" ssl)
                 symbol)
   :group 'wl)