git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d5939cf
)
Cutthrough: fix error message for unexpected response from onward connection. Bug...
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 1 Apr 2023 20:15:24 +0000
(21:15 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 1 Apr 2023 20:15:24 +0000
(21:15 +0100)
Only affects debug.
src/src/verify.c
patch
|
blob
|
history
diff --git
a/src/src/verify.c
b/src/src/verify.c
index 5c0a3e4080aea8d81e6736f6b341e9b0fe59beca..228f630207d01b9e1bd74f792a24341a555736d3 100644
(file)
--- a/
src/src/verify.c
+++ b/
src/src/verify.c
@@
-3,7
+3,7
@@
*************************************************/
/* Copyright (c) The Exim Maintainers 2020 - 2022 */
*************************************************/
/* Copyright (c) The Exim Maintainers 2020 - 2022 */
-/* Copyright (c) University of Cambridge 1995 - 20
18
*/
+/* Copyright (c) University of Cambridge 1995 - 20
23
*/
/* See the file NOTICE for conditions of use and distribution. */
/* SPDX-License-Identifier: GPL-2.0-or-later */
/* 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)
{
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))
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 rea
d");
+ cancel_cutthrough_connection(TRUE, US"
unexpected response to smtp comman
d");
if(copy)
{
if(copy)
{