Gitweb:
https://git.exim.org/exim.git/commitdiff/843edb3830b89e01fd2b956d2a0d23d13e29b55e
Commit: 843edb3830b89e01fd2b956d2a0d23d13e29b55e
Parent: 649c209e19281edd67beee84e9e60b0849f84554
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Mar 11 22:44:27 2021 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Tue Mar 16 12:42:00 2021 +0000
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 2a392e5..2b03c03 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 73ae667..943af04 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 f23d8c2..827baa5 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:<CALLER@???>
- SMTP>> RCPT TO:<yes@???>
- SMTP>> RCPT TO:<n00@???>
- SMTP>> RCPT TO:<n01@???>
- SMTP>> RCPT TO:<n02@???>
- SMTP>> RCPT TO:<n03@???>
- SMTP>> RCPT TO:<n04@???>
- SMTP>> RCPT TO:<n05@???>
- SMTP>> RCPT TO:<n06@???>
- SMTP>> RCPT TO:<n07@???>
- SMTP>> RCPT TO:<n08@???>
- SMTP>> RCPT TO:<n09@???>
- SMTP>> RCPT TO:<n10@???>
- SMTP>> RCPT TO:<n11@???>
- SMTP>> RCPT TO:<n12@???>
- SMTP>> RCPT TO:<n13@???>
- SMTP>> RCPT TO:<n14@???>
- SMTP>> RCPT TO:<n15@???>
- SMTP>> RCPT TO:<n16@???>
- SMTP>> RCPT TO:<n17@???>
- SMTP>> RCPT TO:<n18@???>
- SMTP>> RCPT TO:<n19@???>
- SMTP>> RCPT TO:<n20@???>
- SMTP>> RCPT TO:<n21@???>
- SMTP>> RCPT TO:<n22@???>
- SMTP>> RCPT TO:<n23@???>
- SMTP>> RCPT TO:<n24@???>
- SMTP>> RCPT TO:<n25@???>
- SMTP>> RCPT TO:<n26@???>
- SMTP>> RCPT TO:<n27@???>
- SMTP>> RCPT TO:<n28@???>
- SMTP>> RCPT TO:<n29@???>
- SMTP>> RCPT TO:<n30@???>
- SMTP>> RCPT TO:<n31@???>
- SMTP>> RCPT TO:<n32@???>
- SMTP>> RCPT TO:<n33@???>
- SMTP>> RCPT TO:<n34@???>
- SMTP>> RCPT TO:<n35@???>
- SMTP>> RCPT TO:<n36@???>
- SMTP>> RCPT TO:<n37@???>
- SMTP>> RCPT TO:<n38@???>
- SMTP>> RCPT TO:<n39@???>
- SMTP>> RCPT TO:<n40@???>
- SMTP>> RCPT TO:<n41@???>
- SMTP>> RCPT TO:<n42@???>
- SMTP>> RCPT TO:<n43@???>
- SMTP>> RCPT TO:<n44@???>
- SMTP>> RCPT TO:<n45@???>
- SMTP>> RCPT TO:<n46@???>
- SMTP>> RCPT TO:<n47@???>
- SMTP>> RCPT TO:<n48@???>
- SMTP>> RCPT TO:<n49@???>
- SMTP>> RCPT TO:<n50@???>
- SMTP>> RCPT TO:<n51@???>
- SMTP>> RCPT TO:<n52@???>
- SMTP>> RCPT TO:<n53@???>
- SMTP>> RCPT TO:<n54@???>
- SMTP>> RCPT TO:<n55@???>
- SMTP>> RCPT TO:<n56@???>
- SMTP>> RCPT TO:<n57@???>
- SMTP>> RCPT TO:<n58@???>
- SMTP>> RCPT TO:<n59@???>
- SMTP>> RCPT TO:<n60@???>
- SMTP>> RCPT TO:<n61@???>
- SMTP>> RCPT TO:<n62@???>
- SMTP>> RCPT TO:<n63@???>
- SMTP>> RCPT TO:<n64@???>
- SMTP>> RCPT TO:<n65@???>
- SMTP>> RCPT TO:<n66@???>
- SMTP>> RCPT TO:<n67@???>
- SMTP>> RCPT TO:<n68@???>
- SMTP>> RCPT TO:<n69@???>
- SMTP>> RCPT TO:<n70@???>
- SMTP>> RCPT TO:<n71@???>
- SMTP>> RCPT TO:<n72@???>
- SMTP>> RCPT TO:<n73@???>
- SMTP>> RCPT TO:<n74@???>
- SMTP>> RCPT TO:<n75@???>
- SMTP>> RCPT TO:<n76@???>
- SMTP>> RCPT TO:<n77@???>
- SMTP>> RCPT TO:<n78@???>
- SMTP>> RCPT TO:<n79@???>
- SMTP>> RCPT TO:<n80@???>
- SMTP>> RCPT TO:<n81@???>
- SMTP>> RCPT TO:<n82@???>
- SMTP>> RCPT TO:<n83@???>
- SMTP>> RCPT TO:<n84@???>
- SMTP>> RCPT TO:<n85@???>
- SMTP>> RCPT TO:<n86@???>
- SMTP>> RCPT TO:<n87@???>
- SMTP>> RCPT TO:<n88@???>
- SMTP>> RCPT TO:<n89@???>
- SMTP>> RCPT TO:<n90@???>
- SMTP>> RCPT TO:<n91@???>
- SMTP>> RCPT TO:<n92@???>
- SMTP>> RCPT TO:<n93@???>
- SMTP>> RCPT TO:<n94@???>
- SMTP>> RCPT TO:<n95@???>
- SMTP>> RCPT TO:<n96@???>
- SMTP>> RCPT TO:<n97@???>
- SMTP>> RCPT TO:<n98@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<yes@???>
+ SMTP|> RCPT TO:<n00@???>
+ SMTP|> RCPT TO:<n01@???>
+ SMTP|> RCPT TO:<n02@???>
+ SMTP|> RCPT TO:<n03@???>
+ SMTP|> RCPT TO:<n04@???>
+ SMTP|> RCPT TO:<n05@???>
+ SMTP|> RCPT TO:<n06@???>
+ SMTP|> RCPT TO:<n07@???>
+ SMTP|> RCPT TO:<n08@???>
+ SMTP|> RCPT TO:<n09@???>
+ SMTP|> RCPT TO:<n10@???>
+ SMTP|> RCPT TO:<n11@???>
+ SMTP|> RCPT TO:<n12@???>
+ SMTP|> RCPT TO:<n13@???>
+ SMTP|> RCPT TO:<n14@???>
+ SMTP|> RCPT TO:<n15@???>
+ SMTP|> RCPT TO:<n16@???>
+ SMTP|> RCPT TO:<n17@???>
+ SMTP|> RCPT TO:<n18@???>
+ SMTP|> RCPT TO:<n19@???>
+ SMTP|> RCPT TO:<n20@???>
+ SMTP|> RCPT TO:<n21@???>
+ SMTP|> RCPT TO:<n22@???>
+ SMTP|> RCPT TO:<n23@???>
+ SMTP|> RCPT TO:<n24@???>
+ SMTP|> RCPT TO:<n25@???>
+ SMTP|> RCPT TO:<n26@???>
+ SMTP|> RCPT TO:<n27@???>
+ SMTP|> RCPT TO:<n28@???>
+ SMTP|> RCPT TO:<n29@???>
+ SMTP|> RCPT TO:<n30@???>
+ SMTP|> RCPT TO:<n31@???>
+ SMTP|> RCPT TO:<n32@???>
+ SMTP|> RCPT TO:<n33@???>
+ SMTP|> RCPT TO:<n34@???>
+ SMTP|> RCPT TO:<n35@???>
+ SMTP|> RCPT TO:<n36@???>
+ SMTP|> RCPT TO:<n37@???>
+ SMTP|> RCPT TO:<n38@???>
+ SMTP|> RCPT TO:<n39@???>
+ SMTP|> RCPT TO:<n40@???>
+ SMTP|> RCPT TO:<n41@???>
+ SMTP|> RCPT TO:<n42@???>
+ SMTP|> RCPT TO:<n43@???>
+ SMTP|> RCPT TO:<n44@???>
+ SMTP|> RCPT TO:<n45@???>
+ SMTP|> RCPT TO:<n46@???>
+ SMTP|> RCPT TO:<n47@???>
+ SMTP|> RCPT TO:<n48@???>
+ SMTP|> RCPT TO:<n49@???>
+ SMTP|> RCPT TO:<n50@???>
+ SMTP|> RCPT TO:<n51@???>
+ SMTP|> RCPT TO:<n52@???>
+ SMTP|> RCPT TO:<n53@???>
+ SMTP|> RCPT TO:<n54@???>
+ SMTP|> RCPT TO:<n55@???>
+ SMTP|> RCPT TO:<n56@???>
+ SMTP|> RCPT TO:<n57@???>
+ SMTP|> RCPT TO:<n58@???>
+ SMTP|> RCPT TO:<n59@???>
+ SMTP|> RCPT TO:<n60@???>
+ SMTP|> RCPT TO:<n61@???>
+ SMTP|> RCPT TO:<n62@???>
+ SMTP|> RCPT TO:<n63@???>
+ SMTP|> RCPT TO:<n64@???>
+ SMTP|> RCPT TO:<n65@???>
+ SMTP|> RCPT TO:<n66@???>
+ SMTP|> RCPT TO:<n67@???>
+ SMTP|> RCPT TO:<n68@???>
+ SMTP|> RCPT TO:<n69@???>
+ SMTP|> RCPT TO:<n70@???>
+ SMTP|> RCPT TO:<n71@???>
+ SMTP|> RCPT TO:<n72@???>
+ SMTP|> RCPT TO:<n73@???>
+ SMTP|> RCPT TO:<n74@???>
+ SMTP|> RCPT TO:<n75@???>
+ SMTP|> RCPT TO:<n76@???>
+ SMTP|> RCPT TO:<n77@???>
+ SMTP|> RCPT TO:<n78@???>
+ SMTP|> RCPT TO:<n79@???>
+ SMTP|> RCPT TO:<n80@???>
+ SMTP|> RCPT TO:<n81@???>
+ SMTP|> RCPT TO:<n82@???>
+ SMTP|> RCPT TO:<n83@???>
+ SMTP|> RCPT TO:<n84@???>
+ SMTP|> RCPT TO:<n85@???>
+ SMTP|> RCPT TO:<n86@???>
+ SMTP|> RCPT TO:<n87@???>
+ SMTP|> RCPT TO:<n88@???>
+ SMTP|> RCPT TO:<n89@???>
+ SMTP|> RCPT TO:<n90@???>
+ SMTP|> RCPT TO:<n91@???>
+ SMTP|> RCPT TO:<n92@???>
+ SMTP|> RCPT TO:<n93@???>
+ SMTP|> RCPT TO:<n94@???>
+ SMTP|> RCPT TO:<n95@???>
+ SMTP|> RCPT TO:<n96@???>
+ SMTP|> RCPT TO:<n97@???>
+ SMTP|> RCPT TO:<n98@???>
SMTP>> RCPT TO:<n99@???>
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:<n100@???>
- SMTP>> RCPT TO:<n101@???>
- SMTP>> RCPT TO:<n102@???>
- SMTP>> RCPT TO:<n103@???>
- SMTP>> RCPT TO:<n104@???>
- SMTP>> RCPT TO:<n105@???>
- SMTP>> RCPT TO:<n106@???>
- SMTP>> RCPT TO:<n107@???>
- SMTP>> RCPT TO:<n108@???>
- SMTP>> RCPT TO:<n109@???>
- SMTP>> RCPT TO:<n110@???>
- SMTP>> RCPT TO:<n111@???>
- SMTP>> RCPT TO:<n112@???>
- SMTP>> RCPT TO:<n113@???>
- SMTP>> RCPT TO:<n114@???>
- SMTP>> RCPT TO:<n115@???>
- SMTP>> RCPT TO:<n116@???>
- SMTP>> RCPT TO:<n117@???>
- SMTP>> RCPT TO:<n118@???>
- SMTP>> RCPT TO:<n119@???>
- SMTP>> RCPT TO:<n120@???>
- SMTP>> RCPT TO:<n121@???>
- SMTP>> RCPT TO:<n122@???>
- SMTP>> RCPT TO:<n123@???>
- SMTP>> RCPT TO:<n124@???>
- SMTP>> RCPT TO:<n125@???>
- SMTP>> RCPT TO:<n126@???>
- SMTP>> RCPT TO:<n127@???>
- SMTP>> RCPT TO:<n128@???>
- SMTP>> RCPT TO:<n129@???>
- SMTP>> RCPT TO:<n130@???>
- SMTP>> RCPT TO:<n131@???>
- SMTP>> RCPT TO:<n132@???>
- SMTP>> RCPT TO:<n133@???>
- SMTP>> RCPT TO:<n134@???>
- SMTP>> RCPT TO:<n135@???>
- SMTP>> RCPT TO:<n136@???>
- SMTP>> RCPT TO:<n137@???>
- SMTP>> RCPT TO:<n138@???>
- SMTP>> RCPT TO:<n139@???>
- SMTP>> RCPT TO:<n140@???>
- SMTP>> RCPT TO:<n141@???>
- SMTP>> RCPT TO:<n142@???>
- SMTP>> RCPT TO:<n143@???>
- SMTP>> RCPT TO:<n144@???>
- SMTP>> RCPT TO:<n145@???>
- SMTP>> RCPT TO:<n146@???>
- SMTP>> RCPT TO:<n147@???>
- SMTP>> RCPT TO:<n148@???>
- SMTP>> RCPT TO:<n149@???>
- SMTP>> RCPT TO:<n150@???>
- SMTP>> RCPT TO:<n151@???>
- SMTP>> RCPT TO:<n152@???>
- SMTP>> RCPT TO:<n153@???>
- SMTP>> RCPT TO:<n154@???>
- SMTP>> RCPT TO:<n155@???>
- SMTP>> RCPT TO:<n156@???>
- SMTP>> RCPT TO:<n157@???>
- SMTP>> RCPT TO:<n158@???>
- SMTP>> RCPT TO:<n159@???>
- SMTP>> RCPT TO:<n160@???>
- SMTP>> RCPT TO:<n161@???>
- SMTP>> RCPT TO:<n162@???>
- SMTP>> RCPT TO:<n163@???>
- SMTP>> RCPT TO:<n164@???>
- SMTP>> RCPT TO:<n165@???>
- SMTP>> RCPT TO:<n166@???>
- SMTP>> RCPT TO:<n167@???>
- SMTP>> RCPT TO:<n168@???>
- SMTP>> RCPT TO:<n169@???>
- SMTP>> RCPT TO:<n170@???>
- SMTP>> RCPT TO:<n171@???>
- SMTP>> RCPT TO:<n172@???>
- SMTP>> RCPT TO:<n173@???>
- SMTP>> RCPT TO:<n174@???>
- SMTP>> RCPT TO:<n175@???>
- SMTP>> RCPT TO:<n176@???>
- SMTP>> RCPT TO:<n177@???>
- SMTP>> RCPT TO:<n178@???>
- SMTP>> RCPT TO:<n179@???>
- SMTP>> RCPT TO:<n180@???>
- SMTP>> RCPT TO:<n181@???>
- SMTP>> RCPT TO:<n182@???>
- SMTP>> RCPT TO:<n183@???>
- SMTP>> RCPT TO:<n184@???>
- SMTP>> RCPT TO:<n185@???>
- SMTP>> RCPT TO:<n186@???>
- SMTP>> RCPT TO:<n187@???>
- SMTP>> RCPT TO:<n188@???>
- SMTP>> RCPT TO:<n189@???>
- SMTP>> RCPT TO:<n190@???>
- SMTP>> RCPT TO:<n191@???>
- SMTP>> RCPT TO:<n192@???>
- SMTP>> RCPT TO:<n193@???>
- SMTP>> RCPT TO:<n194@???>
- SMTP>> RCPT TO:<n195@???>
- SMTP>> RCPT TO:<n196@???>
- SMTP>> RCPT TO:<n197@???>
- SMTP>> RCPT TO:<n198@???>
- SMTP>> RCPT TO:<n199@???>
+ SMTP|> RCPT TO:<n100@???>
+ SMTP|> RCPT TO:<n101@???>
+ SMTP|> RCPT TO:<n102@???>
+ SMTP|> RCPT TO:<n103@???>
+ SMTP|> RCPT TO:<n104@???>
+ SMTP|> RCPT TO:<n105@???>
+ SMTP|> RCPT TO:<n106@???>
+ SMTP|> RCPT TO:<n107@???>
+ SMTP|> RCPT TO:<n108@???>
+ SMTP|> RCPT TO:<n109@???>
+ SMTP|> RCPT TO:<n110@???>
+ SMTP|> RCPT TO:<n111@???>
+ SMTP|> RCPT TO:<n112@???>
+ SMTP|> RCPT TO:<n113@???>
+ SMTP|> RCPT TO:<n114@???>
+ SMTP|> RCPT TO:<n115@???>
+ SMTP|> RCPT TO:<n116@???>
+ SMTP|> RCPT TO:<n117@???>
+ SMTP|> RCPT TO:<n118@???>
+ SMTP|> RCPT TO:<n119@???>
+ SMTP|> RCPT TO:<n120@???>
+ SMTP|> RCPT TO:<n121@???>
+ SMTP|> RCPT TO:<n122@???>
+ SMTP|> RCPT TO:<n123@???>
+ SMTP|> RCPT TO:<n124@???>
+ SMTP|> RCPT TO:<n125@???>
+ SMTP|> RCPT TO:<n126@???>
+ SMTP|> RCPT TO:<n127@???>
+ SMTP|> RCPT TO:<n128@???>
+ SMTP|> RCPT TO:<n129@???>
+ SMTP|> RCPT TO:<n130@???>
+ SMTP|> RCPT TO:<n131@???>
+ SMTP|> RCPT TO:<n132@???>
+ SMTP|> RCPT TO:<n133@???>
+ SMTP|> RCPT TO:<n134@???>
+ SMTP|> RCPT TO:<n135@???>
+ SMTP|> RCPT TO:<n136@???>
+ SMTP|> RCPT TO:<n137@???>
+ SMTP|> RCPT TO:<n138@???>
+ SMTP|> RCPT TO:<n139@???>
+ SMTP|> RCPT TO:<n140@???>
+ SMTP|> RCPT TO:<n141@???>
+ SMTP|> RCPT TO:<n142@???>
+ SMTP|> RCPT TO:<n143@???>
+ SMTP|> RCPT TO:<n144@???>
+ SMTP|> RCPT TO:<n145@???>
+ SMTP|> RCPT TO:<n146@???>
+ SMTP|> RCPT TO:<n147@???>
+ SMTP|> RCPT TO:<n148@???>
+ SMTP|> RCPT TO:<n149@???>
+ SMTP|> RCPT TO:<n150@???>
+ SMTP|> RCPT TO:<n151@???>
+ SMTP|> RCPT TO:<n152@???>
+ SMTP|> RCPT TO:<n153@???>
+ SMTP|> RCPT TO:<n154@???>
+ SMTP|> RCPT TO:<n155@???>
+ SMTP|> RCPT TO:<n156@???>
+ SMTP|> RCPT TO:<n157@???>
+ SMTP|> RCPT TO:<n158@???>
+ SMTP|> RCPT TO:<n159@???>
+ SMTP|> RCPT TO:<n160@???>
+ SMTP|> RCPT TO:<n161@???>
+ SMTP|> RCPT TO:<n162@???>
+ SMTP|> RCPT TO:<n163@???>
+ SMTP|> RCPT TO:<n164@???>
+ SMTP|> RCPT TO:<n165@???>
+ SMTP|> RCPT TO:<n166@???>
+ SMTP|> RCPT TO:<n167@???>
+ SMTP|> RCPT TO:<n168@???>
+ SMTP|> RCPT TO:<n169@???>
+ SMTP|> RCPT TO:<n170@???>
+ SMTP|> RCPT TO:<n171@???>
+ SMTP|> RCPT TO:<n172@???>
+ SMTP|> RCPT TO:<n173@???>
+ SMTP|> RCPT TO:<n174@???>
+ SMTP|> RCPT TO:<n175@???>
+ SMTP|> RCPT TO:<n176@???>
+ SMTP|> RCPT TO:<n177@???>
+ SMTP|> RCPT TO:<n178@???>
+ SMTP|> RCPT TO:<n179@???>
+ SMTP|> RCPT TO:<n180@???>
+ SMTP|> RCPT TO:<n181@???>
+ SMTP|> RCPT TO:<n182@???>
+ SMTP|> RCPT TO:<n183@???>
+ SMTP|> RCPT TO:<n184@???>
+ SMTP|> RCPT TO:<n185@???>
+ SMTP|> RCPT TO:<n186@???>
+ SMTP|> RCPT TO:<n187@???>
+ SMTP|> RCPT TO:<n188@???>
+ SMTP|> RCPT TO:<n189@???>
+ SMTP|> RCPT TO:<n190@???>
+ SMTP|> RCPT TO:<n191@???>
+ SMTP|> RCPT TO:<n192@???>
+ SMTP|> RCPT TO:<n193@???>
+ SMTP|> RCPT TO:<n194@???>
+ SMTP|> RCPT TO:<n195@???>
+ SMTP|> RCPT TO:<n196@???>
+ SMTP|> RCPT TO:<n197@???>
+ SMTP|> RCPT TO:<n198@???>
+ SMTP|> RCPT TO:<n199@???>
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@??? 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@??? 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 9cbe05f..2ff9c98 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:<CALLER@???>
- SMTP>> RCPT TO:<a@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<a@???>
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:<CALLER@???>
- SMTP>> RCPT TO:<b@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<b@???>
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@??? F=<CALLER@???> 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:<CALLER@???>
- SMTP>> RCPT TO:<a@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<a@???>
SMTP>> DATA
SMTP<< 550 NO
SMTP<< 503 Unexpected RCPT
SMTP<< 503 Unexpected DATA
- SMTP>> QUIT
+ SMTP+> QUIT
SMTP(close)>>
LOG: MAIN
** a@??? F=<CALLER@???> 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:<CALLER@???>: 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:<CALLER@???>
- SMTP>> RCPT TO:<b@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<b@???>
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:<CALLER@???>
- SMTP>> RCPT TO:<c@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<c@???>
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@??? F=<CALLER@???> 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 992e67b..5894d75 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:<CALLER@???>
- SMTP>> RCPT TO:<userx@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<userx@???>
SMTP>> DATA
SMTP<< 250 OK
SMTP<< 250 OK
SMTP<< 500 NO
- SMTP>> QUIT
+ SMTP+> QUIT
SMTP(close)>>
LOG: MAIN
** userx@??? 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@??? 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 f65b6f6..4536358 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:<x@y>: 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 fdf48df..5cc2f0a 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@??? 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 52fe40a..152bfd8 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:<CALLER@???>
- SMTP>> RCPT TO:<userx@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<userx@???>
SMTP>> DATA
cmd buf flush ddd bytes
sync_responses expect mail
diff --git a/test/stderr/0578 b/test/stderr/0578
index a2b7c81..8a34234 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:<ok@localhost>
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:<bad@localhost>
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:<ok@localhost>
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:<ok@otherhost>
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:<postmaster@otherhost>
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:<ok@otherhost2>
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:<postmaster@otherhost2>
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:<myhost.test.ex-dddddddd-testing@otherhost3>
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:<myhost.test.ex-dddddddd-testing@otherhost4>
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:<myhost.test.ex-dddddddd-testing@otherhost41>
SMTP<< 250 OK
SMTP<< 550 NOT OK
SMTP>> RSET
SMTP<< 250 OK
- SMTP>> MAIL FROM:<>
+ SMTP|> MAIL FROM:<>
SMTP>> RCPT TO:<ok@otherhost41>
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:<postmaster@otherhost41>
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:<ok@otherhost21>
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:<postmaster@otherhost21>
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:<ok2@otherhost21>
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:<myhost.test.ex-dddddddd-testing@otherhost31>
SMTP<< 250 OK
SMTP<< 550 NOT OK
SMTP>> RSET
SMTP<< 250 OK
- SMTP>> MAIL FROM:<>
+ SMTP|> MAIL FROM:<>
SMTP>> RCPT TO:<ok@otherhost31>
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:<okok@otherhost31>
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:<myhost.test.ex-dddddddd-testing@otherhost31>
SMTP<< 250 OK
SMTP<< 550 NOT OK
SMTP>> RSET
SMTP<< 250 OK
- SMTP>> MAIL FROM:<>
+ SMTP|> MAIL FROM:<>
SMTP>> RCPT TO:<okokok@otherhost31>
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:<myhost.test.ex-dddddddd-testing@otherhost51>
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:<okokok@otherhost52>
SMTP<< 250 OK
SMTP<< 250 OK
Cutthrough cancelled by presence of postmaster verify
SMTP>> RSET
SMTP<< 250 OK
- SMTP>> MAIL FROM:<pmsend@???>
+ SMTP|> MAIL FROM:<pmsend@???>
SMTP>> RCPT TO:<postmaster@otherhost52>
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:<somesender@???>
+ SMTP|> MAIL FROM:<somesender@???>
SMTP>> RCPT TO:<abcd@???>
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:<abcd@???>
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:<ok@otherhost9>
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:<postmaster@otherhost9>
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:<postmaster@???>
+ SMTP|> MAIL FROM:<postmaster@???>
SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@???>
SMTP<< 250 OK
SMTP<< 550 RANDOM IS BAD
SMTP>> RSET
SMTP<< 250 OK
- SMTP>> MAIL FROM:<postmaster@???>
+ SMTP|> MAIL FROM:<postmaster@???>
SMTP>> RCPT TO:<z@???>
SMTP<< 250 OK
SMTP<< 250 OK
Cutthrough cancelled by presence of postmaster verify
SMTP>> RSET
SMTP<< 250 OK
- SMTP>> MAIL FROM:<pmsend@???>
+ SMTP|> MAIL FROM:<pmsend@???>
SMTP>> RCPT TO:<postmaster@???>
SMTP<< 250 OK
SMTP<< 250 OK
diff --git a/test/stderr/1150 b/test/stderr/1150
index f339bfc..03ee03d 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<CALLER@???>
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@??? 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<CALLER@???>
- SMTP>> RCPT TO:<xyz@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<CALLER@???>
+ SMTP|> RCPT TO:<xyz@???>
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@??? 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<abcd@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<abcd@???>
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@??? 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 3335276..321544e 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userx@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<userx@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userz@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<userz@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<usery@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<usery@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<usera@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<usera@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userc@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<userc@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userb@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<userb@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userx@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<userx@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<userz@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<userz@???>
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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<usery@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<usery@???>
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 6a2b72e..a302240 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<CALLER@???>
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@??? 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<CALLER@???>
- SMTP>> RCPT TO:<xyz@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<CALLER@???>
+ SMTP|> RCPT TO:<xyz@???>
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@??? 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<abcd@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<abcd@???>
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@??? 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 2c9f064..95c3b78 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:<usera@???>
+ SMTP|> MAIL FROM:<usera@???>
SMTP>> RCPT TO:<userb@???>
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 2c9f064..95c3b78 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:<usera@???>
+ SMTP|> MAIL FROM:<usera@???>
SMTP>> RCPT TO:<userb@???>
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 a35594e..c117158 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@??? 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@??? 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@??? 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 49bee93..c824cb4 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@???)
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:<CALLER@???>
- SMTP>> RCPT TO:<extchange@???>
+ SMTP|> MAIL FROM:<CALLER@???>
+ SMTP|> RCPT TO:<extchange@???>
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 d88fc98..ad927fc 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:<CALLER@???> SIZE=ssss
- SMTP>> RCPT TO:<d@???>
+ SMTP|> MAIL FROM:<CALLER@???> SIZE=ssss
+ SMTP|> RCPT TO:<d@???>
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 6e82c6a..e4623f3 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:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<userx@???>
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:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<usery@???>
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:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<usery@???>
cmd buf flush ddd bytes
sync_responses expect mail
diff --git a/test/stderr/5420 b/test/stderr/5420
index 5d70979..0b35b44 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:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<userx@???>
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:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<usery@???>
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:<CALLER@???>
+ SMTP|> MAIL FROM:<CALLER@???>
SMTP>> RCPT TO:<usery@???>
cmd buf flush ddd bytes
sync_responses expect mail
diff --git a/test/stderr/5820 b/test/stderr/5820
index 5bb9029..7d3ee56 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:<rcptuser@???>
>>> cmd buf flush 52 bytes
>>> SMTP<< 250 OK
diff --git a/test/stderr/5840 b/test/stderr/5840
index 423ed83..8ece4e4 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:<rcptuser@???>
>>> cmd buf flush 52 bytes
>>> SMTP<< 250 OK
