X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b48cf0793366791f5bdef8526a4956d4523c6778..dafd09ae6c826dffaa63a54e903659a12ca5be05:/test/stderr/0217?ds=sidebyside

diff --git a/test/stderr/0217 b/test/stderr/0217
index c65c953a4..c03f53a2d 100644
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -1,186 +1,114 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
-delivering 10HmbL-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmbL-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
          250 PIPELINING
-  SMTP>> MAIL FROM:<CALLER@test.ex>
-  SMTP>> RCPT TO:<yes@test.ex>
-  SMTP>> RCPT TO:<n00@test.ex>
-  SMTP>> RCPT TO:<n01@test.ex>
-  SMTP>> RCPT TO:<n02@test.ex>
-  SMTP>> RCPT TO:<n03@test.ex>
-  SMTP>> RCPT TO:<n04@test.ex>
-  SMTP>> RCPT TO:<n05@test.ex>
-  SMTP>> RCPT TO:<n06@test.ex>
-  SMTP>> RCPT TO:<n07@test.ex>
-  SMTP>> RCPT TO:<n08@test.ex>
-  SMTP>> RCPT TO:<n09@test.ex>
-  SMTP>> RCPT TO:<n10@test.ex>
-  SMTP>> RCPT TO:<n11@test.ex>
-  SMTP>> RCPT TO:<n12@test.ex>
-  SMTP>> RCPT TO:<n13@test.ex>
-  SMTP>> RCPT TO:<n14@test.ex>
-  SMTP>> RCPT TO:<n15@test.ex>
-  SMTP>> RCPT TO:<n16@test.ex>
-  SMTP>> RCPT TO:<n17@test.ex>
-  SMTP>> RCPT TO:<n18@test.ex>
-  SMTP>> RCPT TO:<n19@test.ex>
-  SMTP>> RCPT TO:<n20@test.ex>
-  SMTP>> RCPT TO:<n21@test.ex>
-  SMTP>> RCPT TO:<n22@test.ex>
-  SMTP>> RCPT TO:<n23@test.ex>
-  SMTP>> RCPT TO:<n24@test.ex>
-  SMTP>> RCPT TO:<n25@test.ex>
-  SMTP>> RCPT TO:<n26@test.ex>
-  SMTP>> RCPT TO:<n27@test.ex>
-  SMTP>> RCPT TO:<n28@test.ex>
-  SMTP>> RCPT TO:<n29@test.ex>
-  SMTP>> RCPT TO:<n30@test.ex>
-  SMTP>> RCPT TO:<n31@test.ex>
-  SMTP>> RCPT TO:<n32@test.ex>
-  SMTP>> RCPT TO:<n33@test.ex>
-  SMTP>> RCPT TO:<n34@test.ex>
-  SMTP>> RCPT TO:<n35@test.ex>
-  SMTP>> RCPT TO:<n36@test.ex>
-  SMTP>> RCPT TO:<n37@test.ex>
-  SMTP>> RCPT TO:<n38@test.ex>
-  SMTP>> RCPT TO:<n39@test.ex>
-  SMTP>> RCPT TO:<n40@test.ex>
-  SMTP>> RCPT TO:<n41@test.ex>
-  SMTP>> RCPT TO:<n42@test.ex>
-  SMTP>> RCPT TO:<n43@test.ex>
-  SMTP>> RCPT TO:<n44@test.ex>
-  SMTP>> RCPT TO:<n45@test.ex>
-  SMTP>> RCPT TO:<n46@test.ex>
-  SMTP>> RCPT TO:<n47@test.ex>
-  SMTP>> RCPT TO:<n48@test.ex>
-  SMTP>> RCPT TO:<n49@test.ex>
-  SMTP>> RCPT TO:<n50@test.ex>
-  SMTP>> RCPT TO:<n51@test.ex>
-  SMTP>> RCPT TO:<n52@test.ex>
-  SMTP>> RCPT TO:<n53@test.ex>
-  SMTP>> RCPT TO:<n54@test.ex>
-  SMTP>> RCPT TO:<n55@test.ex>
-  SMTP>> RCPT TO:<n56@test.ex>
-  SMTP>> RCPT TO:<n57@test.ex>
-  SMTP>> RCPT TO:<n58@test.ex>
-  SMTP>> RCPT TO:<n59@test.ex>
-  SMTP>> RCPT TO:<n60@test.ex>
-  SMTP>> RCPT TO:<n61@test.ex>
-  SMTP>> RCPT TO:<n62@test.ex>
-  SMTP>> RCPT TO:<n63@test.ex>
-  SMTP>> RCPT TO:<n64@test.ex>
-  SMTP>> RCPT TO:<n65@test.ex>
-  SMTP>> RCPT TO:<n66@test.ex>
-  SMTP>> RCPT TO:<n67@test.ex>
-  SMTP>> RCPT TO:<n68@test.ex>
-  SMTP>> RCPT TO:<n69@test.ex>
-  SMTP>> RCPT TO:<n70@test.ex>
-  SMTP>> RCPT TO:<n71@test.ex>
-  SMTP>> RCPT TO:<n72@test.ex>
-  SMTP>> RCPT TO:<n73@test.ex>
-  SMTP>> RCPT TO:<n74@test.ex>
-  SMTP>> RCPT TO:<n75@test.ex>
-  SMTP>> RCPT TO:<n76@test.ex>
-  SMTP>> RCPT TO:<n77@test.ex>
-  SMTP>> RCPT TO:<n78@test.ex>
-  SMTP>> RCPT TO:<n79@test.ex>
-  SMTP>> RCPT TO:<n80@test.ex>
-  SMTP>> RCPT TO:<n81@test.ex>
-  SMTP>> RCPT TO:<n82@test.ex>
-  SMTP>> RCPT TO:<n83@test.ex>
-  SMTP>> RCPT TO:<n84@test.ex>
-  SMTP>> RCPT TO:<n85@test.ex>
-  SMTP>> RCPT TO:<n86@test.ex>
-  SMTP>> RCPT TO:<n87@test.ex>
-  SMTP>> RCPT TO:<n88@test.ex>
-  SMTP>> RCPT TO:<n89@test.ex>
-  SMTP>> RCPT TO:<n90@test.ex>
-  SMTP>> RCPT TO:<n91@test.ex>
-  SMTP>> RCPT TO:<n92@test.ex>
-  SMTP>> RCPT TO:<n93@test.ex>
-  SMTP>> RCPT TO:<n94@test.ex>
-  SMTP>> RCPT TO:<n95@test.ex>
-  SMTP>> RCPT TO:<n96@test.ex>
-  SMTP>> RCPT TO:<n97@test.ex>
-  SMTP>> RCPT TO:<n98@test.ex>
+  SMTP|> MAIL FROM:<CALLER@test.ex>
+  SMTP|> RCPT TO:<yes@test.ex>
+  SMTP|> RCPT TO:<n00@test.ex>
+  SMTP|> RCPT TO:<n01@test.ex>
+  SMTP|> RCPT TO:<n02@test.ex>
+  SMTP|> RCPT TO:<n03@test.ex>
+  SMTP|> RCPT TO:<n04@test.ex>
+  SMTP|> RCPT TO:<n05@test.ex>
+  SMTP|> RCPT TO:<n06@test.ex>
+  SMTP|> RCPT TO:<n07@test.ex>
+  SMTP|> RCPT TO:<n08@test.ex>
+  SMTP|> RCPT TO:<n09@test.ex>
+  SMTP|> RCPT TO:<n10@test.ex>
+  SMTP|> RCPT TO:<n11@test.ex>
+  SMTP|> RCPT TO:<n12@test.ex>
+  SMTP|> RCPT TO:<n13@test.ex>
+  SMTP|> RCPT TO:<n14@test.ex>
+  SMTP|> RCPT TO:<n15@test.ex>
+  SMTP|> RCPT TO:<n16@test.ex>
+  SMTP|> RCPT TO:<n17@test.ex>
+  SMTP|> RCPT TO:<n18@test.ex>
+  SMTP|> RCPT TO:<n19@test.ex>
+  SMTP|> RCPT TO:<n20@test.ex>
+  SMTP|> RCPT TO:<n21@test.ex>
+  SMTP|> RCPT TO:<n22@test.ex>
+  SMTP|> RCPT TO:<n23@test.ex>
+  SMTP|> RCPT TO:<n24@test.ex>
+  SMTP|> RCPT TO:<n25@test.ex>
+  SMTP|> RCPT TO:<n26@test.ex>
+  SMTP|> RCPT TO:<n27@test.ex>
+  SMTP|> RCPT TO:<n28@test.ex>
+  SMTP|> RCPT TO:<n29@test.ex>
+  SMTP|> RCPT TO:<n30@test.ex>
+  SMTP|> RCPT TO:<n31@test.ex>
+  SMTP|> RCPT TO:<n32@test.ex>
+  SMTP|> RCPT TO:<n33@test.ex>
+  SMTP|> RCPT TO:<n34@test.ex>
+  SMTP|> RCPT TO:<n35@test.ex>
+  SMTP|> RCPT TO:<n36@test.ex>
+  SMTP|> RCPT TO:<n37@test.ex>
+  SMTP|> RCPT TO:<n38@test.ex>
+  SMTP|> RCPT TO:<n39@test.ex>
+  SMTP|> RCPT TO:<n40@test.ex>
+  SMTP|> RCPT TO:<n41@test.ex>
+  SMTP|> RCPT TO:<n42@test.ex>
+  SMTP|> RCPT TO:<n43@test.ex>
+  SMTP|> RCPT TO:<n44@test.ex>
+  SMTP|> RCPT TO:<n45@test.ex>
+  SMTP|> RCPT TO:<n46@test.ex>
+  SMTP|> RCPT TO:<n47@test.ex>
+  SMTP|> RCPT TO:<n48@test.ex>
+  SMTP|> RCPT TO:<n49@test.ex>
+  SMTP|> RCPT TO:<n50@test.ex>
+  SMTP|> RCPT TO:<n51@test.ex>
+  SMTP|> RCPT TO:<n52@test.ex>
+  SMTP|> RCPT TO:<n53@test.ex>
+  SMTP|> RCPT TO:<n54@test.ex>
+  SMTP|> RCPT TO:<n55@test.ex>
+  SMTP|> RCPT TO:<n56@test.ex>
+  SMTP|> RCPT TO:<n57@test.ex>
+  SMTP|> RCPT TO:<n58@test.ex>
+  SMTP|> RCPT TO:<n59@test.ex>
+  SMTP|> RCPT TO:<n60@test.ex>
+  SMTP|> RCPT TO:<n61@test.ex>
+  SMTP|> RCPT TO:<n62@test.ex>
+  SMTP|> RCPT TO:<n63@test.ex>
+  SMTP|> RCPT TO:<n64@test.ex>
+  SMTP|> RCPT TO:<n65@test.ex>
+  SMTP|> RCPT TO:<n66@test.ex>
+  SMTP|> RCPT TO:<n67@test.ex>
+  SMTP|> RCPT TO:<n68@test.ex>
+  SMTP|> RCPT TO:<n69@test.ex>
+  SMTP|> RCPT TO:<n70@test.ex>
+  SMTP|> RCPT TO:<n71@test.ex>
+  SMTP|> RCPT TO:<n72@test.ex>
+  SMTP|> RCPT TO:<n73@test.ex>
+  SMTP|> RCPT TO:<n74@test.ex>
+  SMTP|> RCPT TO:<n75@test.ex>
+  SMTP|> RCPT TO:<n76@test.ex>
+  SMTP|> RCPT TO:<n77@test.ex>
+  SMTP|> RCPT TO:<n78@test.ex>
+  SMTP|> RCPT TO:<n79@test.ex>
+  SMTP|> RCPT TO:<n80@test.ex>
+  SMTP|> RCPT TO:<n81@test.ex>
+  SMTP|> RCPT TO:<n82@test.ex>
+  SMTP|> RCPT TO:<n83@test.ex>
+  SMTP|> RCPT TO:<n84@test.ex>
+  SMTP|> RCPT TO:<n85@test.ex>
+  SMTP|> RCPT TO:<n86@test.ex>
+  SMTP|> RCPT TO:<n87@test.ex>
+  SMTP|> RCPT TO:<n88@test.ex>
+  SMTP|> RCPT TO:<n89@test.ex>
+  SMTP|> RCPT TO:<n90@test.ex>
+  SMTP|> RCPT TO:<n91@test.ex>
+  SMTP|> RCPT TO:<n92@test.ex>
+  SMTP|> RCPT TO:<n93@test.ex>
+  SMTP|> RCPT TO:<n94@test.ex>
+  SMTP|> RCPT TO:<n95@test.ex>
+  SMTP|> RCPT TO:<n96@test.ex>
+  SMTP|> RCPT TO:<n97@test.ex>
+  SMTP|> RCPT TO:<n98@test.ex>
   SMTP>> RCPT TO:<n99@test.ex>
-  SMTP>> RCPT TO:<n100@test.ex>
-  SMTP>> RCPT TO:<n101@test.ex>
-  SMTP>> RCPT TO:<n102@test.ex>
-  SMTP>> RCPT TO:<n103@test.ex>
-  SMTP>> RCPT TO:<n104@test.ex>
-  SMTP>> RCPT TO:<n105@test.ex>
-  SMTP>> RCPT TO:<n106@test.ex>
-  SMTP>> RCPT TO:<n107@test.ex>
-  SMTP>> RCPT TO:<n108@test.ex>
-  SMTP>> RCPT TO:<n109@test.ex>
-  SMTP>> RCPT TO:<n110@test.ex>
-  SMTP>> RCPT TO:<n111@test.ex>
-  SMTP>> RCPT TO:<n112@test.ex>
-  SMTP>> RCPT TO:<n113@test.ex>
-  SMTP>> RCPT TO:<n114@test.ex>
-  SMTP>> RCPT TO:<n115@test.ex>
-  SMTP>> RCPT TO:<n116@test.ex>
-  SMTP>> RCPT TO:<n117@test.ex>
-  SMTP>> RCPT TO:<n118@test.ex>
-  SMTP>> RCPT TO:<n119@test.ex>
-  SMTP>> RCPT TO:<n120@test.ex>
-  SMTP>> RCPT TO:<n121@test.ex>
-  SMTP>> RCPT TO:<n122@test.ex>
-  SMTP>> RCPT TO:<n123@test.ex>
-  SMTP>> RCPT TO:<n124@test.ex>
-  SMTP>> RCPT TO:<n125@test.ex>
-  SMTP>> RCPT TO:<n126@test.ex>
-  SMTP>> RCPT TO:<n127@test.ex>
-  SMTP>> RCPT TO:<n128@test.ex>
-  SMTP>> RCPT TO:<n129@test.ex>
-  SMTP>> RCPT TO:<n130@test.ex>
-  SMTP>> RCPT TO:<n131@test.ex>
-  SMTP>> RCPT TO:<n132@test.ex>
-  SMTP>> RCPT TO:<n133@test.ex>
-  SMTP>> RCPT TO:<n134@test.ex>
-  SMTP>> RCPT TO:<n135@test.ex>
-  SMTP>> RCPT TO:<n136@test.ex>
-  SMTP>> RCPT TO:<n137@test.ex>
-  SMTP>> RCPT TO:<n138@test.ex>
-  SMTP>> RCPT TO:<n139@test.ex>
-  SMTP>> RCPT TO:<n140@test.ex>
-  SMTP>> RCPT TO:<n141@test.ex>
-  SMTP>> RCPT TO:<n142@test.ex>
-  SMTP>> RCPT TO:<n143@test.ex>
-  SMTP>> RCPT TO:<n144@test.ex>
-  SMTP>> RCPT TO:<n145@test.ex>
-  SMTP>> RCPT TO:<n146@test.ex>
-  SMTP>> RCPT TO:<n147@test.ex>
-  SMTP>> RCPT TO:<n148@test.ex>
-  SMTP>> RCPT TO:<n149@test.ex>
-  SMTP>> RCPT TO:<n150@test.ex>
-  SMTP>> RCPT TO:<n151@test.ex>
-  SMTP>> RCPT TO:<n152@test.ex>
-  SMTP>> RCPT TO:<n153@test.ex>
-  SMTP>> RCPT TO:<n154@test.ex>
-  SMTP>> RCPT TO:<n155@test.ex>
-  SMTP>> RCPT TO:<n156@test.ex>
-  SMTP>> RCPT TO:<n157@test.ex>
-  SMTP>> RCPT TO:<n158@test.ex>
-  SMTP>> RCPT TO:<n159@test.ex>
-  SMTP>> RCPT TO:<n160@test.ex>
-  SMTP>> RCPT TO:<n161@test.ex>
-  SMTP>> RCPT TO:<n162@test.ex>
-  SMTP>> RCPT TO:<n163@test.ex>
-  SMTP>> RCPT TO:<n164@test.ex>
-  SMTP>> RCPT TO:<n165@test.ex>
-  SMTP>> RCPT TO:<n166@test.ex>
-  SMTP>> RCPT TO:<n167@test.ex>
-  SMTP>> RCPT TO:<n168@test.ex>
-  SMTP>> RCPT TO:<n169@test.ex>
-  SMTP>> RCPT TO:<n170@test.ex>
-  SMTP>> RCPT TO:<n171@test.ex>
-  SMTP>> RCPT TO:<n172@test.ex>
   SMTP<< 250 OK
   SMTP<< 250 OK
   SMTP<< 550 NO
@@ -283,6 +211,107 @@ 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@test.ex>
+  SMTP|> RCPT TO:<n101@test.ex>
+  SMTP|> RCPT TO:<n102@test.ex>
+  SMTP|> RCPT TO:<n103@test.ex>
+  SMTP|> RCPT TO:<n104@test.ex>
+  SMTP|> RCPT TO:<n105@test.ex>
+  SMTP|> RCPT TO:<n106@test.ex>
+  SMTP|> RCPT TO:<n107@test.ex>
+  SMTP|> RCPT TO:<n108@test.ex>
+  SMTP|> RCPT TO:<n109@test.ex>
+  SMTP|> RCPT TO:<n110@test.ex>
+  SMTP|> RCPT TO:<n111@test.ex>
+  SMTP|> RCPT TO:<n112@test.ex>
+  SMTP|> RCPT TO:<n113@test.ex>
+  SMTP|> RCPT TO:<n114@test.ex>
+  SMTP|> RCPT TO:<n115@test.ex>
+  SMTP|> RCPT TO:<n116@test.ex>
+  SMTP|> RCPT TO:<n117@test.ex>
+  SMTP|> RCPT TO:<n118@test.ex>
+  SMTP|> RCPT TO:<n119@test.ex>
+  SMTP|> RCPT TO:<n120@test.ex>
+  SMTP|> RCPT TO:<n121@test.ex>
+  SMTP|> RCPT TO:<n122@test.ex>
+  SMTP|> RCPT TO:<n123@test.ex>
+  SMTP|> RCPT TO:<n124@test.ex>
+  SMTP|> RCPT TO:<n125@test.ex>
+  SMTP|> RCPT TO:<n126@test.ex>
+  SMTP|> RCPT TO:<n127@test.ex>
+  SMTP|> RCPT TO:<n128@test.ex>
+  SMTP|> RCPT TO:<n129@test.ex>
+  SMTP|> RCPT TO:<n130@test.ex>
+  SMTP|> RCPT TO:<n131@test.ex>
+  SMTP|> RCPT TO:<n132@test.ex>
+  SMTP|> RCPT TO:<n133@test.ex>
+  SMTP|> RCPT TO:<n134@test.ex>
+  SMTP|> RCPT TO:<n135@test.ex>
+  SMTP|> RCPT TO:<n136@test.ex>
+  SMTP|> RCPT TO:<n137@test.ex>
+  SMTP|> RCPT TO:<n138@test.ex>
+  SMTP|> RCPT TO:<n139@test.ex>
+  SMTP|> RCPT TO:<n140@test.ex>
+  SMTP|> RCPT TO:<n141@test.ex>
+  SMTP|> RCPT TO:<n142@test.ex>
+  SMTP|> RCPT TO:<n143@test.ex>
+  SMTP|> RCPT TO:<n144@test.ex>
+  SMTP|> RCPT TO:<n145@test.ex>
+  SMTP|> RCPT TO:<n146@test.ex>
+  SMTP|> RCPT TO:<n147@test.ex>
+  SMTP|> RCPT TO:<n148@test.ex>
+  SMTP|> RCPT TO:<n149@test.ex>
+  SMTP|> RCPT TO:<n150@test.ex>
+  SMTP|> RCPT TO:<n151@test.ex>
+  SMTP|> RCPT TO:<n152@test.ex>
+  SMTP|> RCPT TO:<n153@test.ex>
+  SMTP|> RCPT TO:<n154@test.ex>
+  SMTP|> RCPT TO:<n155@test.ex>
+  SMTP|> RCPT TO:<n156@test.ex>
+  SMTP|> RCPT TO:<n157@test.ex>
+  SMTP|> RCPT TO:<n158@test.ex>
+  SMTP|> RCPT TO:<n159@test.ex>
+  SMTP|> RCPT TO:<n160@test.ex>
+  SMTP|> RCPT TO:<n161@test.ex>
+  SMTP|> RCPT TO:<n162@test.ex>
+  SMTP|> RCPT TO:<n163@test.ex>
+  SMTP|> RCPT TO:<n164@test.ex>
+  SMTP|> RCPT TO:<n165@test.ex>
+  SMTP|> RCPT TO:<n166@test.ex>
+  SMTP|> RCPT TO:<n167@test.ex>
+  SMTP|> RCPT TO:<n168@test.ex>
+  SMTP|> RCPT TO:<n169@test.ex>
+  SMTP|> RCPT TO:<n170@test.ex>
+  SMTP|> RCPT TO:<n171@test.ex>
+  SMTP|> RCPT TO:<n172@test.ex>
+  SMTP|> RCPT TO:<n173@test.ex>
+  SMTP|> RCPT TO:<n174@test.ex>
+  SMTP|> RCPT TO:<n175@test.ex>
+  SMTP|> RCPT TO:<n176@test.ex>
+  SMTP|> RCPT TO:<n177@test.ex>
+  SMTP|> RCPT TO:<n178@test.ex>
+  SMTP|> RCPT TO:<n179@test.ex>
+  SMTP|> RCPT TO:<n180@test.ex>
+  SMTP|> RCPT TO:<n181@test.ex>
+  SMTP|> RCPT TO:<n182@test.ex>
+  SMTP|> RCPT TO:<n183@test.ex>
+  SMTP|> RCPT TO:<n184@test.ex>
+  SMTP|> RCPT TO:<n185@test.ex>
+  SMTP|> RCPT TO:<n186@test.ex>
+  SMTP|> RCPT TO:<n187@test.ex>
+  SMTP|> RCPT TO:<n188@test.ex>
+  SMTP|> RCPT TO:<n189@test.ex>
+  SMTP|> RCPT TO:<n190@test.ex>
+  SMTP|> RCPT TO:<n191@test.ex>
+  SMTP|> RCPT TO:<n192@test.ex>
+  SMTP|> RCPT TO:<n193@test.ex>
+  SMTP|> RCPT TO:<n194@test.ex>
+  SMTP|> RCPT TO:<n195@test.ex>
+  SMTP|> RCPT TO:<n196@test.ex>
+  SMTP|> RCPT TO:<n197@test.ex>
+  SMTP|> RCPT TO:<n198@test.ex>
+  SMTP|> RCPT TO:<n199@test.ex>
+  SMTP>> DATA
   SMTP<< 550 NO
   SMTP<< 550 NO
   SMTP<< 550 NO
@@ -355,34 +384,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 550 NO
   SMTP<< 550 NO
   SMTP<< 550 NO
-  SMTP>> RCPT TO:<n173@test.ex>
-  SMTP>> RCPT TO:<n174@test.ex>
-  SMTP>> RCPT TO:<n175@test.ex>
-  SMTP>> RCPT TO:<n176@test.ex>
-  SMTP>> RCPT TO:<n177@test.ex>
-  SMTP>> RCPT TO:<n178@test.ex>
-  SMTP>> RCPT TO:<n179@test.ex>
-  SMTP>> RCPT TO:<n180@test.ex>
-  SMTP>> RCPT TO:<n181@test.ex>
-  SMTP>> RCPT TO:<n182@test.ex>
-  SMTP>> RCPT TO:<n183@test.ex>
-  SMTP>> RCPT TO:<n184@test.ex>
-  SMTP>> RCPT TO:<n185@test.ex>
-  SMTP>> RCPT TO:<n186@test.ex>
-  SMTP>> RCPT TO:<n187@test.ex>
-  SMTP>> RCPT TO:<n188@test.ex>
-  SMTP>> RCPT TO:<n189@test.ex>
-  SMTP>> RCPT TO:<n190@test.ex>
-  SMTP>> RCPT TO:<n191@test.ex>
-  SMTP>> RCPT TO:<n192@test.ex>
-  SMTP>> RCPT TO:<n193@test.ex>
-  SMTP>> RCPT TO:<n194@test.ex>
-  SMTP>> RCPT TO:<n195@test.ex>
-  SMTP>> RCPT TO:<n196@test.ex>
-  SMTP>> RCPT TO:<n197@test.ex>
-  SMTP>> RCPT TO:<n198@test.ex>
-  SMTP>> RCPT TO:<n199@test.ex>
-  SMTP>> DATA
   SMTP<< 550 NO
   SMTP<< 550 NO
   SMTP<< 550 NO
@@ -414,8 +415,12 @@ 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(shutdown)>>
+  SMTP<< 250 OK
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT:250:250:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:RCPT|:DATA:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:550:55
+**** debug string too long - truncated ****
 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
 LOG: MAIN
@@ -819,8 +824,8 @@ LOG: MAIN
 LOG: MAIN
   ** n199@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<n199@test.ex>: 550 NO
 LOG: MAIN
-  <= <> R=10HmbL-0005vi-00 U=EXIMUSER P=local S=sss
-delivering 10HmbM-0005vi-00
+  <= <> R=10HmbL-000000005vi-0000 U=EXIMUSER P=local S=sss
+delivering 10HmbM-000000005vi-0000
 LOG: MAIN
   ** CALLER@test.ex R=bounce: just discard
 LOG: MAIN
@@ -829,8 +834,9 @@ LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
-delivering 10HmbP-0005vi-00
-Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
+delivering 10HmbP-000000005vi-0000
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -847,10 +853,14 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
   SMTP<< 250 OK
   SMTP>> DATA
   SMTP<< 351 Send more
-  SMTP>> writing message and terminating "."
+  SMTP>> (writing message)
+  SMTP>> .
   SMTP<< 250 OK
-  SMTP>> QUIT
+  SMTP+> QUIT
+  SMTP(shutdown)>>
+  SMTP(closed)<<
   SMTP(close)>>
+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