diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2023-04-01 21:15:24 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2023-04-01 21:15:24 +0100 |
| commit | 8d960c19a447e105a4375c2cbcd0c9493622b6a2 (patch) | |
| tree | 3f8117ab13f697c9ea6b398b773f2e3a6c39b4be | |
| parent | d5939cf05037d4a70ca43ec4d436c2e699530444 (diff) | |
| download | exim4-8d960c19a447e105a4375c2cbcd0c9493622b6a2.tar.gz | |
Cutthrough: fix error message for unexpected response from onward connection. Bug 2912
Only affects debug.
| -rw-r--r-- | src/src/verify.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/src/verify.c b/src/src/verify.c index 5c0a3e408..228f63020 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -3,7 +3,7 @@ *************************************************/ /* Copyright (c) The Exim Maintainers 2020 - 2022 */ -/* Copyright (c) University of Cambridge 1995 - 2018 */ +/* Copyright (c) University of Cambridge 1995 - 2023 */ /* See the file NOTICE for conditions of use and distribution. */ /* SPDX-License-Identifier: GPL-2.0-or-later */ @@ -1329,7 +1329,13 @@ cutthrough_data_puts(US"\r\n", 2); } -/* Get and check response from cutthrough target */ +/* Get and check response from cutthrough target. +Used for +- nonfirst RCPT +- predata +- data finaldot +- cutthrough conn close +*/ static uschar cutthrough_response(client_conn_ctx * cctx, char expect, uschar ** copy, int timeout) { @@ -1343,7 +1349,7 @@ sx.inblock.ptr = inbuffer; sx.inblock.ptrend = inbuffer; sx.inblock.cctx = cctx; if(!smtp_read_response(&sx, responsebuffer, sizeof(responsebuffer), expect, timeout)) - cancel_cutthrough_connection(TRUE, US"target timeout on read"); + cancel_cutthrough_connection(TRUE, US"unexpected response to smtp command"); if(copy) { |