generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

smtp: Fixed an issue when processing EHLO failure responses (Part 3)

Browse Source 
Follow up fix to commit 62bd21746443 to cater for servers that don't
respond with a 250 in their EHLO responses. Additionally updated the
SMTP tests to respond with a 250 response code as per RFC5321.
This commit is contained in:
Steve Holme 2013-02-09 19:01:15 +00:00
parent fd52530b50
commit 92f7606f29
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/smtp.c
View File

@ -224,7 +224,7 @@ static int smtp_endofresp(struct pingpong *pp, int *resp)
*resp = curlx_sltosi(strtol(line, NULL, 10)); *resp = curlx_sltosi(strtol(line, NULL, 10));
/* Are we processing EHLO command data? */ /* Are we processing EHLO command data? */
if(smtpc->state == SMTP_EHLO && (!result || (result && *resp == 250))) { if(smtpc->state == SMTP_EHLO && (!result || (result && *resp/100 == 2))) {
line += 4; line += 4;
len -= 4; len -= 4;

2
tests/data/test805
View File

@ -12,7 +12,7 @@ RFC4954
# Server-side # Server-side
<reply> <reply>
<servercmd> <servercmd>
REPLY EHLO 220 AUTH PLAIN REPLY EHLO 250 AUTH PLAIN
REPLY AUTH 235 Authenticated REPLY AUTH 235 Authenticated
</servercmd> </servercmd>
</reply> </reply>

2
tests/data/test806
View File

@ -11,7 +11,7 @@ RFC4954
# Server-side # Server-side
<reply> <reply>
<servercmd> <servercmd>
REPLY EHLO 220 AUTH LOGIN REPLY EHLO 250 AUTH LOGIN
REPLY AUTH 334 UGFzc3dvcmQ6 REPLY AUTH 334 UGFzc3dvcmQ6
REPLY MTIzNA== 235 Authenticated REPLY MTIzNA== 235 Authenticated
</servercmd> </servercmd>

2
tests/data/test807
View File

@ -12,7 +12,7 @@ RFC4954
# Server-side # Server-side
<reply> <reply>
<servercmd> <servercmd>
REPLY EHLO 220 AUTH CRAM-MD5 REPLY EHLO 250 AUTH CRAM-MD5
REPLY AUTH 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+ REPLY AUTH 334 PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+
REPLY dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw 235 Authenticated REPLY dGltIGI5MTNhNjAyYzdlZGE3YTQ5NWI0ZTZlNzMzNGQzODkw 235 Authenticated
</servercmd> </servercmd>