_ Adjusted RFC821 HELO fallback and enabled test804

diff --git a/lib/smtp.c b/lib/smtp.c
index 45df3042e71ef53cd28c7df923299ebcad357afa..d14c44be4085bfe65c7f54a761f1e8525e73435c 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -325,7 +325,7 @@ static CURLcode smtp_state_ehlo_resp(struct connectdata *conn,
   (void)instate; /* no use for this yet */
 
   if(smtpcode/100 != 2) {
-    if(data->set.ftp_ssl > CURLUSESSL_TRY && !conn->ssl[FIRSTSOCKET].use)
+    if(data->set.ftp_ssl <= CURLUSESSL_TRY)
       result = smtp_state_helo(conn);
     else {
       failf(data, "Access denied: %d", smtpcode);

diff --git a/tests/data/DISABLED b/tests/data/DISABLED
index 24bc532c2c059bc3a48ac3031f43d8e7e29269d5..c65cdd90b9470e64113fcc9c92c942bd8e09f06b 100644 (file)
--- a/tests/data/DISABLED
+++ b/tests/data/DISABLED
@@ -7,4 +7,3 @@
 564
 802
 803
-804

diff --git a/tests/data/test804 b/tests/data/test804
index e1fc419e9422af2949105a6be09181f9f2fd13d2..3d490c52b84e9c2270f1c4bc4c07899ccfb13f33 100644 (file)
--- a/tests/data/test804
+++ b/tests/data/test804
@@ -1,59 +1,59 @@
-<testcase>\r
-<info>\r
-<keywords>\r
-SMTP\r
-SMTP HELO\r
-RFC821\r
-</keywords>\r
-</info>\r
+<testcase>
+<info>
+<keywords>
+SMTP
+SMTP HELO
+RFC821
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<servercmd>
+REPLY EHLO 500 Command unrecognized
+REPLY HELO 250 Already old but still servicing...
+</servercmd>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+ <name>
+RFC821-only SMTP server (EHLO not supported)
+ </name>
+<stdin>
+From: different
+To: another
+
+body
+</stdin>
+ <command>
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO user\r
+HELO user\r
+MAIL FROM:804@from\r
+RCPT TO:<804@foo>\r
+DATA\r
+QUIT\r
+</protocol>
+<upload>
+From: different
+To: another
+
+body
 \r
-#\r
-# Server-side\r
-<reply>\r
-<servercmd>\r
-REPLY EHLO 500 Command unrecognized\r
-REPLY HELO 250 Already old but still servicing...\r
-</servercmd>\r
-</reply>\r
-\r
-#\r
-# Client-side\r
-<client>\r
-<server>\r
-smtp\r
-</server>\r
- <name>\r
-RFC821-only SMTP server (EHLO not supported)\r
- </name>\r
-<stdin>\r
-From: different\r
-To: another\r
-\r
-body\r
-</stdin>\r
- <command>\r
-smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -\r
-</command>\r
-</client>\r
-\r
-#\r
-# Verify data after the test has been "shot"\r
-<verify>\r
-<protocol>\r
-EHLO user\r\r
-HELO user\r\r
-MAIL FROM:804@from\r\r
-RCPT TO:<804@foo>\r\r
-DATA\r\r
-QUIT\r\r
-</protocol>\r
-<upload>\r
-From: different\r
-To: another\r
-\r
-body\r
-\r\r
-.\r\r
-</upload>\r
-</verify>\r
-</testcase>\r
+.\r
+</upload>
+</verify>
+</testcase>