From 843edb3830b89e01fd2b956d2a0d23d13e29b55e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 11 Mar 2021 22:44:27 +0000 Subject: [PATCH 1/1] Debug: tag client SMTP output with buffering qualifier --- src/src/smtp_out.c | 3 +- test/stderr/0143 | 2 +- test/stderr/0217 | 406 ++++++++++++++++++++++----------------------- test/stderr/0218 | 26 +-- test/stderr/0276 | 8 +- test/stderr/0388 | 2 +- test/stderr/0467 | 2 +- test/stderr/0476 | 4 +- test/stderr/0578 | 60 +++---- test/stderr/1150 | 20 +-- test/stderr/1157 | 42 ++--- test/stderr/1160 | 20 +-- test/stderr/2035 | 4 +- test/stderr/2135 | 4 +- test/stderr/3404 | 6 +- test/stderr/4052 | 8 +- test/stderr/4520 | 6 +- test/stderr/5410 | 6 +- test/stderr/5420 | 6 +- test/stderr/5820 | 2 +- test/stderr/5840 | 2 +- 21 files changed, 320 insertions(+), 319 deletions(-) diff --git a/src/src/smtp_out.c b/src/src/smtp_out.c index 2a392e50f..2b03c03f3 100644 --- a/src/src/smtp_out.c +++ b/src/src/smtp_out.c @@ -659,7 +659,8 @@ if (format) while (*p) *p++ = '*'; } - HDEBUG(D_transport|D_acl|D_v) debug_printf_indent(" SMTP>> %s\n", big_buffer); + HDEBUG(D_transport|D_acl|D_v) + debug_printf_indent(" SMTP%c> %s\n", ">+|"[mode], big_buffer); } if (mode != SCMD_BUFFER) diff --git a/test/stderr/0143 b/test/stderr/0143 index 73ae66765..943af0453 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -49,7 +49,7 @@ transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 transport_check_waiting: FALSE - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> Leaving my_smtp transport diff --git a/test/stderr/0217 b/test/stderr/0217 index f23d8c2c4..827baa5ed 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -6,107 +6,107 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -210,106 +210,106 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550 NO SMTP<< 550 NO SMTP<< 550 NO - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: - SMTP>> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 550 NO SMTP<< 550 NO @@ -414,7 +414,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 403 Sorry temp data error LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN == yes@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error @@ -849,7 +849,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 351 Send more SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" diff --git a/test/stderr/0218 b/test/stderr/0218 index 9cbe05ff0..2ff9c985f 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -25,8 +25,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK @@ -47,15 +47,15 @@ dropping to exim gid; retaining priv uid delivering 10HmaY-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 Send more SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> 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" @@ -92,13 +92,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 550 NO SMTP<< 503 Unexpected RCPT SMTP<< 503 Unexpected DATA - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> 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 @@ -155,8 +155,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> EHLO myhost.test.ex SMTP<< 250-OK 250 PIPELINING - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 550 Unknown @@ -184,15 +184,15 @@ dropping to exim gid; retaining priv uid delivering 10HmbC-0005vi-00 (queue run pid pppp) R: client (ACL) T: send_to_server (ACL) - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 351 OK SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> 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" diff --git a/test/stderr/0276 b/test/stderr/0276 index 992e67b41..5894d75d0 100644 --- a/test/stderr/0276 +++ b/test/stderr/0276 @@ -7,13 +7,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-server id 250-PIPELINING 250 OK - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 OK SMTP<< 500 NO - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> 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 @@ -47,7 +47,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> DATA SMTP<< 500 NO - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> 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 diff --git a/test/stderr/0388 b/test/stderr/0388 index f65b6f682..453635893 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -98,7 +98,7 @@ cmd buf flush ddd bytes LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK diff --git a/test/stderr/0467 b/test/stderr/0467 index fdf48df31..5cc2f0a58 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -29,7 +29,7 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected SMTP<< 354 OK SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK" diff --git a/test/stderr/0476 b/test/stderr/0476 index 52fe40ae8..152bfd850 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -27,8 +27,8 @@ cmd buf flush ddd bytes 250 OK using PIPELINING not using DSN - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes sync_responses expect mail diff --git a/test/stderr/0578 b/test/stderr/0578 index a2b7c812a..8a342346b 100644 --- a/test/stderr/0578 +++ b/test/stderr/0578 @@ -18,7 +18,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK mail sender SMTP<< 250 OK recipient @@ -91,7 +91,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK sender SMTP<< 550 REJECTED rcpt @@ -149,7 +149,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 550 REJECT mail from SMTP<< 530 BAD SEQUENCE no sender accepted for rcpt @@ -205,14 +205,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK sender SMTP<< 250 OK rcpt Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK reset - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK sender SMTP<< 550 NOT OK rcpt postmaster @@ -269,14 +269,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -327,7 +327,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK accepting that random recipient @@ -379,7 +379,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -431,20 +431,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 550 NOT OK SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -496,14 +496,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -537,7 +537,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -570,13 +570,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 550 NOT OK SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -610,7 +610,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -643,13 +643,13 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 550 NOT OK SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -682,7 +682,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP(Connection timed out)<< @@ -717,14 +717,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -758,7 +758,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK @@ -794,7 +794,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP(Connection timed out)<< @@ -827,14 +827,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM:<> + SMTP|> MAIL FROM:<> SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 550 NOT OK @@ -869,20 +869,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250-Yeah mate 250-PIPELINING 250 OK - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 550 RANDOM IS BAD SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK Cutthrough cancelled by presence of postmaster verify SMTP>> RSET SMTP<< 250 OK - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: SMTP<< 250 OK SMTP<< 250 OK diff --git a/test/stderr/1150 b/test/stderr/1150 index f339bfc96..03ee03d70 100644 --- a/test/stderr/1150 +++ b/test/stderr/1150 @@ -18,15 +18,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmaZ-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" @@ -50,9 +50,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted @@ -60,7 +60,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbA-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" @@ -83,15 +83,15 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbB-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" diff --git a/test/stderr/1157 b/test/stderr/1157 index 333527603..321544e57 100644 --- a/test/stderr/1157 +++ b/test/stderr/1157 @@ -27,8 +27,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -45,8 +45,8 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -64,15 +64,15 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbC-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -113,8 +113,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -131,8 +131,8 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -150,15 +150,15 @@ configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbI-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -199,8 +199,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -236,8 +236,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -273,15 +273,15 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbO-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> LOG: MAIN diff --git a/test/stderr/1160 b/test/stderr/1160 index 6a2b72e90..a30224047 100644 --- a/test/stderr/1160 +++ b/test/stderr/1160 @@ -9,15 +9,15 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmaZ-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmaZ-0005vi-00" @@ -32,9 +32,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted @@ -42,7 +42,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbA-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbA-0005vi-00" @@ -56,15 +56,15 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbB-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=yes C="250 OK id=10HmbB-0005vi-00" diff --git a/test/stderr/2035 b/test/stderr/2035 index 2c9f064a4..95c3b7848 100644 --- a/test/stderr/2035 +++ b/test/stderr/2035 @@ -25,7 +25,7 @@ cmd buf flush ddd bytes 250 HELP using PIPELINING not using DSN - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail @@ -62,7 +62,7 @@ cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 SMTP<< 250 OK id=10HmaY-0005vi-00 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2135 b/test/stderr/2135 index 2c9f064a4..95c3b7848 100644 --- a/test/stderr/2135 +++ b/test/stderr/2135 @@ -25,7 +25,7 @@ cmd buf flush ddd bytes 250 HELP using PIPELINING not using DSN - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail @@ -62,7 +62,7 @@ cannot use sendfile for body: spoolfile not wireformat writing data block fd=dddd size=sss timeout=300 SMTP<< 250 OK id=10HmaY-0005vi-00 ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> >>>>>>>>>>>>>>>> Exim pid=pppp (tls-proxy) terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3404 b/test/stderr/3404 index a35594e44..c1171586f 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -17,7 +17,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 354 Send data SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK" @@ -42,7 +42,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 354 Send data SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK" @@ -71,7 +71,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 354 Send data SMTP>> writing message and terminating "." SMTP<< 250 OK - SMTP>> QUIT + SMTP+> QUIT SMTP(close)>> LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=login C="250 OK" diff --git a/test/stderr/4052 b/test/stderr/4052 index 49bee93f2..c824cb477 100644 --- a/test/stderr/4052 +++ b/test/stderr/4052 @@ -22,11 +22,11 @@ delivering 10HmbP-0005vi-00 to 127.0.0.1 [127.0.0.1] (extchange@test.ex) Transport port=25 replaced by host-specific port=1225 EHLO response bits from cache: cleartext 0x0120/0x0000 crypted 0x0000/0x0000 Using cached cleartext PIPE_CONNECT - SMTP>> EHLO the.local.host.name + SMTP|> EHLO the.local.host.name using PIPELINING not using DSN - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes Connecting to 127.0.0.1 [127.0.0.1]:1225 ... sending dd nonTFO early-data @@ -56,7 +56,7 @@ transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 transport_check_waiting: FALSE - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> Leaving smtp transport diff --git a/test/stderr/4520 b/test/stderr/4520 index d88fc98da..ad927fcbd 100644 --- a/test/stderr/4520 +++ b/test/stderr/4520 @@ -17,8 +17,8 @@ cmd buf flush ddd bytes 250-8BITMIME 250-PIPELINING 250 HELP - SMTP>> MAIL FROM: SIZE=ssss - SMTP>> RCPT TO: + SMTP|> MAIL FROM: SIZE=ssss + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes SMTP<< 250 OK @@ -48,7 +48,7 @@ DKIM >> Signed DKIM-Signature header, canonicalized (relaxed) >>>>>>> dkim-signature:v=1;{SP}a=rsa-sha256;{SP}q=dns/txt;{SP}c=relaxed/relaxed;{SP}d=test.ex;{SP}s=sel_bad;{SP}h=From;{SP}bh=/Ab0giHZitYQbDhFszoqQRUkgqueaX9zatJttIU/plc=;{SP}b=; DKIM [test.ex] Header sha256 computed: 241e16230df5723d899cfae9474c6b376a2ab1f81d1094e358f50ffd0e0067b3 SMTP<< 250 OK id=10HmbL-0005vi-00 - SMTP>> QUIT + SMTP+> QUIT cmd buf flush ddd bytes (more expected) SMTP(close)>> LOG: MAIN diff --git a/test/stderr/5410 b/test/stderr/5410 index 6e82c6ada..e4623f320 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -122,7 +122,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail @@ -364,7 +364,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail @@ -606,7 +606,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail diff --git a/test/stderr/5420 b/test/stderr/5420 index 5d7097930..0b35b4492 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -123,7 +123,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail @@ -365,7 +365,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail @@ -607,7 +607,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) - SMTP>> MAIL FROM: + SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes sync_responses expect mail diff --git a/test/stderr/5820 b/test/stderr/5820 index 5bb902961..7d3ee5627 100644 --- a/test/stderr/5820 +++ b/test/stderr/5820 @@ -47,7 +47,7 @@ >>> 250 HELP >>> ip4.ip4.ip4.ip4 in hosts_avoid_pipelining? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset) ->>> SMTP>> MAIL FROM:<> +>>> SMTP|> MAIL FROM:<> >>> SMTP>> RCPT TO: >>> cmd buf flush 52 bytes >>> SMTP<< 250 OK diff --git a/test/stderr/5840 b/test/stderr/5840 index 423ed83a3..8ece4e42b 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -47,7 +47,7 @@ >>> 250 HELP >>> ip4.ip4.ip4.ip4 in hosts_avoid_pipelining? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset) ->>> SMTP>> MAIL FROM:<> +>>> SMTP|> MAIL FROM:<> >>> SMTP>> RCPT TO: >>> cmd buf flush 52 bytes >>> SMTP<< 250 OK -- 2.30.2