Logging: better tracking of continued-connection use

8 files changed, 95 insertions, 95 deletions

diff --git a/test/log/0217 b/test/log/0217
index 48aa31f4d..be9427a72 100644
--- a/test/log/0217
+++ b/test/log/0217
@@ -328,55 +328,55 @@
 1999-03-02 09:44:33 10HmbQ-0005vi-00 -> y47@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 msg accepted"
 1999-03-02 09:44:33 10HmbQ-0005vi-00 -> y48@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 msg accepted"
 1999-03-02 09:44:33 10HmbQ-0005vi-00 -> y49@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 msg accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => n50@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n51@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n52@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n53@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n54@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n55@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n56@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n57@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n58@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n59@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n60@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n61@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n62@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n63@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n64@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n65@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n66@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n67@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n68@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n69@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n70@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n71@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n72@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n73@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n74@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n75@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n76@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n77@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n78@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n79@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n80@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n81@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n82@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n83@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n84@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n85@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n86@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n87@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n88@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n89@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n90@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n91@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n92@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n93@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n94@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n95@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n96@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n97@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n98@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n99@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 2 accepted"
-1999-03-02 09:44:33 10HmbQ-0005vi-00 => n100@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 mesg 3 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 => n50@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n51@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n52@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n53@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n54@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n55@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n56@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n57@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n58@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n59@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n60@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n61@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n62@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n63@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n64@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n65@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n66@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n67@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n68@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n69@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n70@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n71@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n72@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n73@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n74@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n75@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n76@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n77@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n78@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n79@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n80@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n81@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n82@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n83@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n84@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n85@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n86@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n87@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n88@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n89@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n90@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n91@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n92@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n93@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n94@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n95@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n96@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n97@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n98@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 -> n99@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 2 accepted"
+1999-03-02 09:44:33 10HmbQ-0005vi-00 => n100@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 mesg 3 accepted"
 1999-03-02 09:44:33 10HmbQ-0005vi-00 Completed
diff --git a/test/log/0285 b/test/log/0285
index 4e46a52e5..b50fd3fa7 100644
--- a/test/log/0285
+++ b/test/log/0285
@@ -2,10 +2,10 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK"
+1999-03-02 09:44:33 10HmaX-0005vi-00 -> f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => :blackhole: <CALLER@test.ex> R=bounces
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
@@ -15,10 +15,10 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
diff --git a/test/log/0286 b/test/log/0286
index a8e02ed67..3fc3b5469 100644
--- a/test/log/0286
+++ b/test/log/0286
@@ -1,11 +1,11 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 Start queue run: pid=pppp
-1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
+1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1"
+1999-03-02 09:44:33 10HmaX-0005vi-00 -> b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 1"
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]*: SMTP error from remote mail server after RCPT TO:<c@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaX-0005vi-00 ** d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK message 2"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 3"
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
@@ -17,12 +17,12 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** b@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => c@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> d@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 4"
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** e@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e@test.ex>: 550 Recipient not OK
 1999-03-02 09:44:33 10HmaZ-0005vi-00 ** f@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f@test.ex>: 550 Recipient not OK
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => g@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5"
+1999-03-02 09:44:33 10HmaZ-0005vi-00 -> h@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1]* C="250 OK message 5"
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp
diff --git a/test/log/0299 b/test/log/0299
index 4a154fbc6..13aa50bb0 100644
--- a/test/log/0299
+++ b/test/log/0299
@@ -2,5 +2,5 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 => abc <abc@test.ex> R=r1 T=t1 S=sss ST=t3
 1999-03-02 09:44:33 10HmaX-0005vi-00 => xyz1@ex.test R=r2 T=t2 S=sss H=127.0.0.1 [127.0.0.1] C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 -> xyz2@ex.test R=r2 T=t2 S=sss H=127.0.0.1 [127.0.0.1] C="250 OK"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => xyz3@ex.test R=r2 T=t2 S=sss H=127.0.0.1 [127.0.0.1] C="250 OK"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => xyz3@ex.test R=r2 T=t2 S=sss H=127.0.0.1 [127.0.0.1]* C="250 OK"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
diff --git a/test/log/0622 b/test/log/0622
index 3d6843d9f..d433cbd0a 100644
--- a/test/log/0622
+++ b/test/log/0622
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for A@test.ex B@test.ex C@test.ex D@test.ex E@test.ex F@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex <A@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaY-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex <B@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 => c@test.ex <C@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> d@test.ex <D@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmbA-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> e@test.ex <E@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaZ-0005vi-00"
-1999-03-02 09:44:33 10HmaX-0005vi-00 -> f@test.ex <F@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] L C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex <B@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 => c@test.ex <C@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 -> d@test.ex <D@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK id=10HmbA-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 -> e@test.ex <E@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK id=10HmaZ-0005vi-00"
+1999-03-02 09:44:33 10HmaX-0005vi-00 -> f@test.ex <F@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* L C="250 OK id=10HmaZ-0005vi-00"
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for A@test.ex B@test.ex C@test.ex D@test.ex E@test.ex F@test.ex
 1999-03-02 09:44:33 10HmbB-0005vi-00 => a@test.ex <A@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00"
diff --git a/test/log/5801 b/test/log/5801
index f2431420f..8d534d2d6 100644
--- a/test/log/5801
+++ b/test/log/5801
@@ -18,7 +18,7 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmbG-0005vi-00 => t20@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbI-0005vi-00"
 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbH-0005vi-00 => t21@mxdane512ee1.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbJ-0005vi-00"
+1999-03-02 09:44:33 10HmbH-0005vi-00 => t21@mxdane512ee1.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbJ-0005vi-00"
 1999-03-02 09:44:33 10HmbH-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmbK-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t30@mxdane512ee.test.ex
@@ -34,7 +34,7 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmbO-0005vi-00 => t40@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbQ-0005vi-00"
 1999-03-02 09:44:33 10HmbO-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbP-0005vi-00 => t41@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbR-0005vi-00"
+1999-03-02 09:44:33 10HmbP-0005vi-00 => t41@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbR-0005vi-00"
 1999-03-02 09:44:33 10HmbP-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmbS-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t50@mxdane512ee.test.ex
@@ -50,7 +50,7 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmbW-0005vi-00 => t60@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmbY-0005vi-00"
 1999-03-02 09:44:33 10HmbW-0005vi-00 Completed
-1999-03-02 09:44:33 10HmbX-0005vi-00 => t61@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbZ-0005vi-00"
+1999-03-02 09:44:33 10HmbX-0005vi-00 => t61@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmbZ-0005vi-00"
 1999-03-02 09:44:33 10HmbX-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmcA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t70@mxnondane512ee.test.ex
@@ -58,7 +58,7 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmcA-0005vi-00 => t70@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmcC-0005vi-00"
 1999-03-02 09:44:33 10HmcA-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcB-0005vi-00 => t71@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmcD-0005vi-00"
+1999-03-02 09:44:33 10HmcB-0005vi-00 => t71@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmcD-0005vi-00"
 1999-03-02 09:44:33 10HmcB-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmcE-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for t80@mxnondane512ee.test.ex
@@ -66,7 +66,7 @@
 1999-03-02 09:44:33 Start queue run: pid=pppp -qq
 1999-03-02 09:44:33 10HmcE-0005vi-00 => t80@mxnondane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmcG-0005vi-00"
 1999-03-02 09:44:33 10HmcE-0005vi-00 Completed
-1999-03-02 09:44:33 10HmcF-0005vi-00 => t91@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4]* X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmcH-0005vi-00"
+1999-03-02 09:44:33 10HmcF-0005vi-00 => t91@mxdane512ee.test.ex R=client T=send_to_server H=dane512ee.test.ex [ip4.ip4.ip4.ip4] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=dane C="250 OK id=10HmcH-0005vi-00"
 1999-03-02 09:44:33 10HmcF-0005vi-00 Completed
 1999-03-02 09:44:33 End queue run: pid=pppp -qq
 
diff --git a/test/scripts/0000-Basic/0286 b/test/scripts/0000-Basic/0286
index 61c8b5173..327fa2e8a 100644
--- a/test/scripts/0000-Basic/0286
+++ b/test/scripts/0000-Basic/0286
@@ -24,13 +24,13 @@ RCPT TO:
 DATA
 354 Send data
 .
-250 OK
+250 OK message 1
 MAIL FROM:
 250 Sender OK
 RCPT TO:
 550 Recipient not OK
 QUIT
-250 OK
+252 OK
 *eof
 220 ESMTP
 EHLO
@@ -45,7 +45,7 @@ RCPT TO:
 DATA
 354 Send data
 .
-250 OK
+250 OK message 2
 MAIL FROM:
 250 Sender OK
 RCPT TO:
@@ -53,9 +53,9 @@ RCPT TO:
 DATA
 354 Send data
 .
-250 OK
+250 OK message 3
 QUIT
-250 OK
+252 OK
 ****
 exim -q
 ****
@@ -86,9 +86,9 @@ RCPT TO:
 DATA
 354 Send data
 .
-250 OK
+250 OK message 4
 QUIT
-250 OK
+252 OK
 *eof
 220 ESMTP
 EHLO
@@ -111,7 +111,7 @@ RCPT TO:
 DATA
 354 Send data
 .
-250 OK
+250 OK message 5
 QUIT
 250 OK
 ****
diff --git a/test/stdout/0286 b/test/stdout/0286
index 993817efa..e0a34b348 100644
--- a/test/stdout/0286
+++ b/test/stdout/0286
@@ -22,13 +22,13 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
-250 OK
+250 OK message 1
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 RCPT TO:<c@test.ex>
 550 Recipient not OK
 QUIT
-250 OK
+252 OK
 Expected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
@@ -52,7 +52,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
-250 OK
+250 OK message 2
 MAIL FROM:<CALLER@test.ex>
 250 Sender OK
 RCPT TO:<f@test.ex>
@@ -67,9 +67,9 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
-250 OK
+250 OK message 3
 QUIT
-250 OK
+252 OK
 End of script
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
@@ -101,9 +101,9 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
-250 OK
+250 OK message 4
 QUIT
-250 OK
+252 OK
 Expected EOF read from client
 Listening on port 1224 ... 
 Connection request from [127.0.0.1]
@@ -135,7 +135,7 @@ From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 .
-250 OK
+250 OK message 5
 QUIT
 250 OK
 End of script