From: okada <okada>
Date: Mon, 30 Jul 2001 10:57:29 +0000 (+0000)
Subject: Synch with flim-1_14
X-Git-Tag: slim-1_14_8~9
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=33a251aa4e359edcab61429368c17e8f454d1ff4;p=elisp%2Fflim.git

Synch with flim-1_14
---

diff --git a/ChangeLog b/ChangeLog
index 487660e..74d1484 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-30  AMAKAWA Shuhei <sa264@cam.ac.uk>
+
+	* smtp.el(smtp-submit-package): Send EHLO after starttls.
+
 2001-06-01  Kenichi OKADA  <okada@opaopa.org>
 
 	* SLIM: Version 1.14.7 released.
diff --git a/smtp.el b/smtp.el
index 75ac48e..a3f97c6 100644
--- a/smtp.el
+++ b/smtp.el
@@ -295,7 +295,9 @@ BUFFER may be a buffer or a buffer name which contains mail message."
 	  (smtp-response-error
 	   (smtp-primitive-helo package)))
 	(if smtp-use-starttls
-	    (smtp-primitive-starttls package))
+	    (progn
+	    (smtp-primitive-starttls package)
+	    (smtp-primitive-ehlo package)))
 	(if smtp-use-sasl
 	    (smtp-primitive-auth package))
 	(smtp-primitive-mailfrom package)
@@ -405,9 +407,7 @@ BUFFER may be a buffer or a buffer name which contains mail message."
     (setq response (smtp-read-response connection))
     (if (/= (car response) 220)
 	(smtp-response-error response))
-    (starttls-negotiate (smtp-connection-process-internal connection))
-    ;; for sendmail warning XXX
-    (smtp-primitive-helo package)))
+    (starttls-negotiate (smtp-connection-process-internal connection))))
 
 (defun smtp-primitive-mailfrom (package)
   (let* ((connection