fix

[elisp/flim.git] / smtp.el

diff --git a/smtp.el b/smtp.el
index e8fc8db..6281fc9 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -42,7 +42,8 @@
   (autoload 'sasl-plain "sasl")
   (autoload 'sasl-scram-md5-client-msg-1 "sasl")
   (autoload 'sasl-scram-md5-client-msg-2 "sasl")
-  (autoload 'sasl-scram-md5-authenticate-server "sasl"))
+  (autoload 'sasl-scram-md5-authenticate-server "sasl")
+  (autoload 'sasl-digest-md5-digest-response "sasl"))
                       
 (eval-when-compile (require 'cl))      ; push
 
@@ -198,16 +199,19 @@ don't define this value."
                      (not (integerp (car response)))
                      (>= (car response) 400))
                  (throw 'done (car (cdr response))))
-             (starttls-negotiate process))
+             (starttls-negotiate process)
+             ;; for sendmail warning XXX
+             (smtp-send-command process (format "HELO %s" (smtp-make-fqdn)))
+             (setq response (smtp-read-response process)))
 
            ;; AUTH --- SMTP Service Extension for Authentication (RFC2554)
            (when smtp-authenticate-type
-             (let ((auth (intern smtp-authenticate-type)) method)
+             (let ((auth smtp-authenticate-type) method)
                (if (and 
                     (memq auth extensions)
                     (setq method (nth 1 (assq auth smtp-authenticate-method-alist))))
                    (funcall method process)
-                 (throw 'smtp-error
+                 (throw 'done
                         (format "AUTH mechanism %s not available" auth)))))
 
            ;; ONEX --- One message transaction only (sendmail extension?)
@@ -311,7 +315,7 @@ don't define this value."
            t)
 
        (if (and process
-                (eq (process-status process) 'open))
+                (memq (process-status process) '(open run)))
        (progn
          ;; QUIT
          (smtp-send-command process "QUIT")
@@ -419,8 +423,7 @@ don't define this value."
 
 (defun smtp-deduce-address-list (smtp-text-buffer header-start header-end)
   "Get address list suitable for smtp RCPT TO:<address>."
-  (let ((case-fold-search t)
-       (simple-address-list "")
+  (let ((simple-address-list "")
        this-line
        this-line-end
        addr-regexp
@@ -429,6 +432,7 @@ don't define this value."
        (save-excursion
          ;;
          (set-buffer smtp-address-buffer)
+         (setq case-fold-search t)
          (erase-buffer)
          (insert (save-excursion
                    (set-buffer smtp-text-buffer)
@@ -680,7 +684,7 @@ don't define this value."
                         user
                         smtp-authenticate-passphrase
                         "smtp" smtp-server realm)
-                       'no-line-break))
+                       'no-line-break) t)
     (setq response (smtp-read-response process))
     (if (or (null (car response))
            (not (integerp (car response)))