From: Jeremy Harris Date: Thu, 21 Dec 2023 23:33:10 +0000 (+0000) Subject: tweak observability X-Git-Tag: exim-4.98-RC0~104 X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/322ae953e144d9e1fdc06d993d2e4551f5fb1322 tweak observability --- diff --git a/src/src/functions.h b/src/src/functions.h index b201467b2..ef84e3d7c 100644 --- a/src/src/functions.h +++ b/src/src/functions.h @@ -1400,6 +1400,11 @@ HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" SMTP%c> %s\n", client_cmd_log = string_catn(client_cmd_log, US"|", 1); (void) string_from_gstring(client_cmd_log); } + else if (mode == SCMD_MORE) + { + client_cmd_log = string_catn(client_cmd_log, US"+", 1); + (void) string_from_gstring(client_cmd_log); + } store_pool = old_pool; } # endif diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c index 90a0eb23e..62557072e 100644 --- a/src/src/smtp_out.c +++ b/src/src/smtp_out.c @@ -649,7 +649,7 @@ Arguments: sx SMTP connection, contains buffer for pipelining, and socket mode buffer, write-with-more-likely, write format a format, starting with one of - of HELO, MAIL FROM, RCPT TO, DATA, ".", or QUIT. + of HELO, MAIL FROM, RCPT TO, DATA, BDAT, ".", or QUIT. If NULL, flush pipeline buffer only. ... data for the format diff --git a/src/src/transport.c b/src/src/transport.c index a0f097579..79a69f941 100644 --- a/src/src/transport.c +++ b/src/src/transport.c @@ -1658,6 +1658,10 @@ another message waiting for the same host. However, it doesn't do this if the current continue sequence is greater than the maximum supplied as an argument, or greater than the global connection_max_messages, which, if set, overrides. +It is also called if conditions are otherwise right for pipelining a QUIT after +the message data, since if there is another message waiting we do not want to +send that QUIT. + Arguments: transport_name name of the transport hostname name of the host diff --git a/test/stderr/0143 b/test/stderr/0143 index c6ff94fe7..d5376a2b4 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -55,7 +55,7 @@ cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' Leaving my_smtp transport LOG: MAIN => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK" diff --git a/test/stderr/0217 b/test/stderr/0217 index f78a7d118..ad5b632f1 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -858,7 +858,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP(closed)<< SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:RCPT:250:RCPT:250:RCPT:250:DATA:351:.:250:QUIT' +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:RCPT:250:RCPT:250:RCPT:250:DATA:351:.:250:QUIT+' LOG: MAIN => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN diff --git a/test/stderr/0218 b/test/stderr/0218 index 43c39ff22..f791c35cc 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -62,7 +62,7 @@ T: send_to_server (ACL) SMTP<< 250 OK SMTP<< 250 OK SMTP(close)>> -cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250' +cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT+:250:250' LOG: MAIN => b@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" LOG: MAIN @@ -108,7 +108,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT:250' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:550:503:503:QUIT+:250' LOG: MAIN ** a@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:: 550 NO Exim version x.yz .... @@ -207,7 +207,7 @@ T: send_to_server (ACL) SMTP<< 250 OK SMTP<< 250 OK SMTP(close)>> -cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT:250:250' +cmdlog: 'MAIL|:RCPT|:DATA:250:250:351:.:QUIT+:250:250' LOG: MAIN => c@test.ex F= R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK" LOG: MAIN diff --git a/test/stderr/0276 b/test/stderr/0276 index 4e98a6c84..34088f60c 100644 --- a/test/stderr/0276 +++ b/test/stderr/0276 @@ -17,7 +17,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 200 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:500:QUIT:200' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:500:QUIT+:200' LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO LOG: MAIN @@ -54,7 +54,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 200 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:500:QUIT:200' +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:500:QUIT+:200' LOG: MAIN ** usery@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO LOG: MAIN diff --git a/test/stderr/0332 b/test/stderr/0332 index 11f0429dc..8cff3bd21 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -81,7 +81,7 @@ After routing: delay@test.again.dns locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile -cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250' +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250' LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" >>>>>>>>>>>>>>>> Exim pid=p1236 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0333 b/test/stderr/0333 index 422ed67bb..0ddd349a3 100644 --- a/test/stderr/0333 +++ b/test/stderr/0333 @@ -79,7 +79,7 @@ After routing: delay@test.again.dns locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile -cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT:250' +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:250:QUIT+:250' LOG: MAIN => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" >>>>>>>>>>>>>>>> Exim pid=p1235 (continued-transport) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0357 b/test/stderr/0357 index c07db78d6..0e16a6e37 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -26,7 +26,7 @@ checking retry status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' reading retry information for R:userx@test.ex: from subprocess added retry item LOG: MAIN @@ -71,7 +71,7 @@ locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' reading retry information for R:userx@test.ex: from subprocess existing delete item dropped added retry item @@ -129,7 +129,7 @@ locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' reading retry information for R:userx@test.ex: from subprocess existing delete item dropped added retry item diff --git a/test/stderr/0358 b/test/stderr/0358 index ea889aad7..8dbb1f66f 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -32,7 +32,7 @@ locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex:: errno=-44 more_errno=dd,A flags=0 -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250' reading retry information for R:userx@test.ex: from subprocess added retry item reading retry information for R:usery@test.ex: from subprocess @@ -96,7 +96,7 @@ no host retry record no message retry record added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A flags=0 added retry item for R:usery@test.ex:: errno=-44 more_errno=dd,A flags=0 -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250' reading retry information for R:userx@test.ex: from subprocess existing delete item dropped added retry item diff --git a/test/stderr/0388 b/test/stderr/0388 index dd3dc3eec..546729f73 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -108,7 +108,7 @@ cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK *@127.0.0.1 in "*"? list element: * diff --git a/test/stderr/0426 b/test/stderr/0426 index 0112cdc10..a97713c59 100644 --- a/test/stderr/0426 +++ b/test/stderr/0426 @@ -49,7 +49,7 @@ After routing: Deferred addresses: locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-t1.lockfile -cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250' LOG: MAIN ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Unknown Exim version x.yz .... diff --git a/test/stderr/0467 b/test/stderr/0467 index 738a07f16..888177562 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -34,7 +34,7 @@ Connecting to localhost.test.ex [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' LOG: MAIN => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:PORT_S C="250 OK" LOG: MAIN diff --git a/test/stderr/0543 b/test/stderr/0543 index 96b982184..5df9df63b 100644 --- a/test/stderr/0543 +++ b/test/stderr/0543 @@ -33,7 +33,7 @@ After routing: Deferred addresses: locking TESTSUITE/spool/db/retry.lockfile locking TESTSUITE/spool/db/wait-smtp.lockfile -cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' LOG: MAIN => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK" LOG: MAIN diff --git a/test/stderr/0554 b/test/stderr/0554 index 2816f0baf..4e6690afb 100644 --- a/test/stderr/0554 +++ b/test/stderr/0554 @@ -19,7 +19,7 @@ checking retry status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available added retry item for R:x@y:: errno=-44 more_errno=dd,A flags=0 -cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' reading retry information for R:x@y: from subprocess added retry item LOG: MAIN @@ -63,7 +63,7 @@ no message retry record added retry item for R:x@y:: errno=dd more_errno=dd,A flags=1 added retry item for R:x@y: errno=dd more_errno=dd,A flags=1 locking TESTSUITE/spool/db/wait-smtp.lockfile -cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' reading retry information for R:x@y from subprocess existing delete item dropped added delete item diff --git a/test/stderr/0623 b/test/stderr/0623 index db3130155..ce3804c13 100644 --- a/test/stderr/0623 +++ b/test/stderr/0623 @@ -54,7 +54,7 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:451:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+:451:221' added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport @@ -118,7 +118,7 @@ cmd buf flush ddd bytes (more expected) ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT:550:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+:550:221' Leaving send_to_server transport LOG: MAIN ** permreject@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 content rejected @@ -186,7 +186,7 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:300:.:QUIT+' added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport diff --git a/test/stderr/0909 b/test/stderr/0909 index e80deaa6b..4d744afd0 100644 --- a/test/stderr/0909 +++ b/test/stderr/0909 @@ -55,7 +55,7 @@ sync_responses expect rcpt for good@test.ex ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:250:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250:250:221' Leaving send_to_server transport LOG: MAIN => good@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L K C="250 OK chunked message data" @@ -120,7 +120,7 @@ cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:BDAT:250:QUIT:221' +cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:BDAT+:250:QUIT+:221' Leaving send_to_server transport LOG: MAIN => nopipe@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] K C="250 OK chunked message data" @@ -188,7 +188,7 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:451:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250:451:221' added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmaZ-000000005vi-0000: errno=-46 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport @@ -256,7 +256,7 @@ sync_responses expect rcpt for permreject@test.ex ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP<< 221 Closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250:550:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250:550:221' Leaving send_to_server transport LOG: MAIN ** permreject@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined end of data: 550 content rejected @@ -328,7 +328,7 @@ LOG: MAIN ok=0 send_quit=0 send_rset=1 continue_more=0 yield=0 first_address is NULL SMTP(closed)<< SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT:QUIT:250:250' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:BDAT+:QUIT+:250:250' added retry item for T:127.0.0.1:127.0.0.1:PORT_D:10HmbB-000000005vi-0000: errno=-18 more_errno=dd,A flags=6 all IP addresses skipped or deferred at least one address Leaving send_to_server transport diff --git a/test/stderr/1157 b/test/stderr/1157 index fbb2e0761..9eaf21d0a 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -82,7 +82,7 @@ cmd buf flush ddd bytes (more expected) SMTP<< 250 OK id=10HmbC-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> -cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT+:250:221' LOG: MAIN => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbC-000000005vi-0000" LOG: MAIN @@ -176,7 +176,7 @@ cmd buf flush ddd bytes (more expected) SMTP<< 250 OK id=10HmbI-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> -cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' +cmdlog: 'MAIL|:RCPT|:DATA:250:250:354:.:QUIT+:250:221' LOG: MAIN => userb@test.ex R=cl_override T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbI-000000005vi-0000" LOG: MAIN diff --git a/test/stderr/2035 b/test/stderr/2035 index 502516dd5..e0085fb16 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -69,7 +69,7 @@ cmd buf flush ddd bytes (more expected) SMTP(TLS shutdown)>> SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> -cmdlog: 'DATA:354:.:250:QUIT:221' +cmdlog: 'DATA:354:.:250:QUIT+:221' Leaving t1 transport LOG: MAIN => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" diff --git a/test/stderr/2135 b/test/stderr/2135 index 502516dd5..e0085fb16 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -69,7 +69,7 @@ cmd buf flush ddd bytes (more expected) SMTP(TLS shutdown)>> SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> -cmdlog: 'DATA:354:.:250:QUIT:221' +cmdlog: 'DATA:354:.:250:QUIT+:221' Leaving t1 transport LOG: MAIN => userb@test.ex R=client T=t1 H=127.0.0.1 [127.0.0.1]:PORT_D X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" diff --git a/test/stderr/3404 b/test/stderr/3404 index 51e88fac3..cf2811e62 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -22,7 +22,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK" LOG: MAIN @@ -51,7 +51,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250-:AUTH:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK" LOG: MAIN @@ -84,7 +84,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -cmdlog: '220:EHLO:250-:AUTH:300:********:300:********:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT:250' +cmdlog: '220:EHLO:250-:AUTH:300:********:300:********:235:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250' LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=login C="250 OK" LOG: MAIN diff --git a/test/stderr/4052 b/test/stderr/4052 index 83232342c..93efa009a 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -63,7 +63,7 @@ cmd buf flush ddd bytes (more expected) ok=1 send_quit=0 send_rset=0 continue_more=0 yield=0 first_address is NULL SMTP<< 220 bye SMTP(close)>> -cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT:250:220' +cmdlog: 'EHLO|:MAIL|:RCPT|:DATA:220:250-:250:250:354:.:QUIT+:250:220' Leaving smtp transport LOG: MAIN => extchange@test.ex R=client T=smtp H=127.0.0.1 [127.0.0.1] L* C="250 message accepted" diff --git a/test/stderr/4510 b/test/stderr/4510 index da20c0d30..47bcef891 100644 --- a/test/stderr/4510 +++ b/test/stderr/4510 @@ -54,7 +54,7 @@ cmd buf flush ddd bytes (more expected) SMTP<< 250 OK id=10HmbL-000000005vi-0000 SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> -cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT:250:221' +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:QUIT+:250:221' LOG: MAIN => d@test.ex R=client T=send_to_server H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] C="250 OK id=10HmbL-000000005vi-0000" LOG: MAIN