moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

_ Adjusted RFC821 HELO fallback and enabled test804

This commit is contained in:
Patrick Monnerat 2010-02-22 13:57:57 +00:00
parent 338553eda3
commit e1625ba727
3 changed files with 59 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/smtp.c
View File

@ -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);

1
tests/data/DISABLED
View File

@ -7,4 +7,3 @@
564
802
803
804

116
tests/data/test804
View File

@ -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>