diff options
| author | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2010-02-22 13:57:57 +0000 |
|---|---|---|
| committer | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2010-02-22 13:57:57 +0000 |
| commit | e1625ba7278c47a1a968126efeac6c51d813e929 (patch) | |
| tree | 342d39f48d6bbc0eec7cc8ac29e67cfb68c32dc1 | |
| parent | 338553eda38a7ed163f935e28461eeda6dde294f (diff) | |
_ Adjusted RFC821 HELO fallback and enabled test804
| -rw-r--r-- | lib/smtp.c | 2 | ||||
| -rw-r--r-- | tests/data/DISABLED | 1 | ||||
| -rw-r--r-- | tests/data/test804 | 116 |
3 files changed, 59 insertions, 60 deletions
diff --git a/lib/smtp.c b/lib/smtp.c index 45df3042e..d14c44be4 100644 --- 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 24bc532c2..c65cdd90b 100644 --- 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 e1fc419e9..3d490c52b 100644 --- a/tests/data/test804 +++ b/tests/data/test804 @@ -1,59 +1,59 @@ -<testcase>
-<info>
-<keywords>
-SMTP
-SMTP HELO
-RFC821
-</keywords>
-</info>
+<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
+HELO user
+MAIL FROM:804@from
+RCPT TO:<804@foo>
+DATA
+QUIT
+</protocol> +<upload> +From: different +To: another + +body -#
-# 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
-HELO user
-MAIL FROM:804@from
-RCPT TO:<804@foo>
-DATA
-QUIT
-</protocol>
-<upload>
-From: different
-To: another
-
-body
-
-.
-</upload>
-</verify>
-</testcase>
+.
+</upload> +</verify> +</testcase> |