|
Line
Link Here
|
| 0 |
-- qmail-remote.c.orig 2005-09-27 00:27:28.000000000 -0400 |
0 |
++ qmail-remote.c 2005-09-27 00:28:41.000000000 -0400 |
|
Lines 534-541
Link Here
|
| 534 |
X509_free(peercert); |
534 |
X509_free(peercert); |
| 535 |
} |
535 |
} |
| 536 |
if (smtps) if (smtpcode() != 220) |
536 |
if (smtps) { |
| 537 |
quit("ZTLS Connected to "," but greeting failed"); |
537 |
int code; |
|
|
538 |
code = smtpcode() |
| 539 |
if (code >= 500 && code < 600) return; |
| 540 |
if (code >= 400 && code < 500) return; /* try next MX, see RFC-2821 */ |
| 541 |
if (code != 220) quit("ZTLS Connected to "," but greeting failed"); |
| 542 |
} |
| 538 |
return 1; |
543 |
return 1; |
| 539 |
} |
544 |
} |
|
Lines 572-578
Link Here
|
| 572 |
#endif |
577 |
#endif |
| 573 |
code = smtpcode(); |
578 |
code = smtpcode(); |
| 574 |
if (code >= 500) quit("DConnected to "," but greeting failed"); |
579 |
if (code >= 500 && code < 600) return; |
|
|
580 |
if (code >= 400 && code < 500) return; /* try next MX, see RFC-2821 */ |
| 575 |
if (code != 220) quit("ZConnected to "," but greeting failed"); |
581 |
if (code != 220) quit("ZConnected to "," but greeting failed"); |
| 576 |
#ifdef EHLO |
582 |
#ifdef EHLO |
|
Lines 985-991
Link Here
|
| 985 |
#ifdef TLS |
991 |
#ifdef TLS |
| 986 |
partner_fqdn = ip.ix[i].fqdn; |
992 |
partner_fqdn = ip.ix[i].fqdn; |
| 987 |
#endif |
993 |
#endif |
| 988 |
smtp(); /* does not return */ |
994 |
smtp(); /* only returns when the next MX is to be tried */ |
| 989 |
} |
995 |
} |
| 990 |
tcpto_err(&ip.ix[i].ip,errno == error_timeout); |
996 |
tcpto_err(&ip.ix[i].ip,errno == error_timeout); |
| 991 |
close(smtpfd); |
997 |
close(smtpfd); |
