General ESMTP support seems pretty good now.

svn path=/trunk/; revision=805

3 files changed, 22 insertions, 16 deletions

diff --git a/README b/README
index 8b610fac..0ff48f7e 100644
--- a/README
+++ b/README
@@ -14,21 +14,9 @@ has also been ported to QNX; to build under QNX, see the header
 comments in the Makefile.
 
 For those of you already familiar with previous versions, here are the
-major new features since 2.0:
+major new features since 3.0:
 
-	** Support for secure use with ssh.
-
-	** Mailserver passwords can be parsed out of your .netrc file.
-
-	** When forwarding mail via SMTP, fetchmail respects the 571
-           "spam filter" response and discards any mail that triggers it.
-
-	** Transaction and error logging may optionally be done via syslog.
-
-	** (Linux only) Security option to permit fetchmail to poll a host 
-	   only when a point-to-point link to a particular IP address is up.
-
-	** RPOP support is back.
+	** Support for ESMTP 8BITMIME and SIZE options
 
 There have also been numerous improvements in multidrop mailbox handling.
 Under many circumstances fetchmail can now determine a mail message's
@@ -56,6 +44,20 @@ pop-perl5-1.2, popc, popmail-1.6 and upop) are marked with **.
 	** Support for retrieving and forwarding from multi-drop mailboxes
 	   that is guaranteed not to cause mail loops.
 
+	** Support for secure use with ssh.
+
+	** Mailserver passwords can be parsed out of your .netrc file.
+
+	** When forwarding mail via SMTP, fetchmail respects the 571
+           "spam filter" response and discards any mail that triggers it.
+
+	** Transaction and error logging may optionally be done via syslog.
+
+	** (Linux only) Security option to permit fetchmail to poll a host 
+	   only when a point-to-point link to a particular IP address is up.
+
+	** RPOP support is back.
+
 	*  Easy control via command line or free-format run control file.
 
 	*  Daemon mode -- fetchmail can be run in background to poll
diff --git a/driver.c b/driver.c
index b9b98cd7..88a54cbd 100644
--- a/driver.c
+++ b/driver.c
@@ -362,6 +362,10 @@ static FILE *smtp_open(struct query *ctl)
 			      ctl->server.names->id,
 			      &lead->server.esmtp_options) != SM_OK)
 	{
+	    /*
+	     * RFC 1869 warns that some listeners hang up on a failed EHLO,
+	     * so it's safest not to assume the socket will still be good.
+	     */
 	    fclose(lead->smtp_sockfp);
 	    lead->smtp_sockfp = (FILE *)NULL;
 	}
diff --git a/fetchmail.man b/fetchmail.man
index a5a24d16..da6df664 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -1001,8 +1001,8 @@ Send comments, bug reports, gripes, and the like to Eric S. Raymond
 elm(1), mail(1), sendmail(8), popd(8), imapd(8)
 .SH APPLICABLE STANDARDS
 .TP 5
-SMTP:
-RFC 821
+SMTP/ESMTP:
+RFC 821, RFC 1869, RFC 1652, RFC 1870 
 .TP 5
 mail:
 RFC 822