diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2016-09-10 21:37:56 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2016-09-11 16:13:03 +0100 |
| commit | a57ce043b4c47bd069343100b602e14fad38c43c (patch) | |
| tree | 1d4166dc0831816487762f51b39561f81e098241 /src | |
| parent | 59a286efa436395d340a4aba2bff35d611800bb5 (diff) | |
Log EHLO response on getting conn-close response for HELO. Bug 1832
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/transports/smtp.c | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index 677ce4ee1..85582e753 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1525,6 +1525,7 @@ struct lflags { BOOL send_quit:1; BOOL setting_up:1; BOOL esmtp:1; + BOOL esmtp_sent:1; BOOL pending_MAIL:1; #ifndef DISABLE_PRDR BOOL prdr_active:1; @@ -1572,6 +1573,7 @@ lflags.send_rset = TRUE; lflags.send_quit = TRUE; lflags.setting_up = TRUE; lflags.esmtp = TRUE; +lflags.esmtp_sent = FALSE; lflags.pending_MAIL; #ifndef DISABLE_PRDR lflags.prdr_active; @@ -1800,6 +1802,7 @@ goto SEND_QUIT; if (smtp_write_command(&outblock, FALSE, "%s %s\r\n", lflags.lmtp ? "LHLO" : "EHLO", helo_data) < 0) goto SEND_FAILED; + lflags.esmtp_sent = TRUE; if (!smtp_read_response(&inblock, buffer, sizeof(buffer), '2', ob->command_timeout)) { @@ -1823,15 +1826,37 @@ goto SEND_QUIT; if (!lflags.esmtp) { BOOL good_response; + int n = sizeof(buffer); + uschar * rsp = buffer; + + if (lflags.esmtp_sent && (n = Ustrlen(buffer)) < sizeof(buffer)/2) + { rsp = buffer + n + 1; n = sizeof(buffer) - n; } if (smtp_write_command(&outblock, FALSE, "HELO %s\r\n", helo_data) < 0) goto SEND_FAILED; - good_response = smtp_read_response(&inblock, buffer, sizeof(buffer), + good_response = smtp_read_response(&inblock, rsp, n, '2', ob->command_timeout); #ifdef EXPERIMENTAL_DSN_INFO - helo_response = string_copy(buffer); + helo_response = string_copy(rsp); #endif - if (!good_response) goto RESPONSE_FAILED; + if (!good_response) + { + /* Handle special logging for a closed connection after HELO + when had previously sent EHLO */ + + if (rsp != buffer && rsp[0] == 0 && (errno == 0 || errno == ECONNRESET)) + { + message = NULL; + lflags.send_quit = FALSE; + save_errno = ERRNO_SMTPCLOSED; + message = string_sprintf("Remote host closed connection " + "in response to %s (EHLO response was: %s)", + smtp_command, buffer); + goto FAILED; + } + Ustrncpy(buffer, rsp, sizeof(buffer)/2); + goto RESPONSE_FAILED; + } } peer_offered = smtp_peer_options = 0; |