Testsuite: fix pgsql testcase

[user/henk/code/exim.git] / test / stderr / 0578

diff --git a/test/stderr/0578 b/test/stderr/0578
index 5e3412f8de740e04f54a4c40f4dddccc2828f657..3be9e2a1c6512f3376fc3b9653280ce5d6a7be03 100644 (file)
--- 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
@@ -30,7 +30,7 @@ wrote callout cache domain record for localhost:
 wrote positive callout cache address record for ok@localhost
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -47,7 +47,7 @@ callout cache: found address record for ok@localhost
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -64,13 +64,13 @@ callout cache: address record expired for ok@localhost
 interface=NULL port=1224
 Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  failed: Connection refused
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
+  H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
 created log directory TESTSUITE/spool/log
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -102,12 +102,12 @@ wrote callout cache domain record for localhost:
   result=1 postmaster=0 random=0
 wrote negative callout cache address record for bad@localhost
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<bad@localhost>: 550 REJECTED rcpt
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -123,12 +123,12 @@ callout cache: found domain record for localhost
 callout cache: found address record for bad@localhost
 callout cache: address record is negative
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <bad@localhost>
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<bad@localhost> rejected RCPT <z@test.ex>: (recipient): Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -159,12 +159,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ...  connected
 wrote callout cache domain record for localhost:
   result=3 postmaster=0 random=0
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: 127.0.0.1 [127.0.0.1] : response to "MAIL FROM:<>" was: 550 REJECT mail from
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -179,12 +179,12 @@ Attempting full verification using callout
 callout cache: found domain record for localhost
 callout cache: domain gave initial rejection, or does not accept HELO or MAIL FROM:<>
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
+  H=(test) [V4NET.0.0.1] U=root sender verify fail for <ok@localhost>
 LOG: MAIN REJECT
-  H=[V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
+  H=(test) [V4NET.0.0.1] U=root F=<ok@localhost> rejected RCPT <z@test.ex>: (mail): Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -223,12 +223,12 @@ wrote callout cache domain record for otherhost:
   result=1 postmaster=2 random=0
 wrote positive callout cache address record for ok@otherhost
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: 127.0.0.1 [127.0.0.1] : SMTP error from remote mail server after RCPT TO:<postmaster@otherhost>: 550 NOT OK rcpt postmaster
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -243,12 +243,12 @@ Attempting full verification using callout
 callout cache: found domain record for otherhost
 callout cache: domain does not accept RCPT TO:<postmaster@domain>
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
+  H=(test) [V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>
 LOG: MAIN REJECT
-  H=[V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
+  H=(test) [V4NET.0.0.2] U=root F=<ok@otherhost> rejected RCPT <z@test.ex>: Sender verify failed
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -288,7 +288,7 @@ wrote callout cache domain record for otherhost2:
 wrote positive callout cache address record for ok@otherhost2
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -306,7 +306,7 @@ callout cache: found address record for ok@otherhost2
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -340,7 +340,7 @@ LOG: MAIN
   (random)
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -358,7 +358,7 @@ LOG: MAIN
   (random)
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -392,7 +392,7 @@ LOG: MAIN
   (random)
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -410,7 +410,7 @@ LOG: MAIN
   (random)
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -456,7 +456,7 @@ wrote callout cache domain record for otherhost41:
 wrote positive callout cache address record for ok@otherhost41
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -475,7 +475,7 @@ callout cache: found address record for ok@otherhost41
 callout cache: address record is positive
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -515,7 +515,7 @@ wrote callout cache domain record for otherhost21:
 wrote positive callout cache address record for ok@otherhost21
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -549,7 +549,7 @@ wrote callout cache domain record for otherhost21:
 wrote positive callout cache address record for ok2@otherhost21
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -588,7 +588,7 @@ wrote callout cache domain record for otherhost31:
 wrote positive callout cache address record for ok@otherhost31
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -622,7 +622,7 @@ wrote callout cache domain record for otherhost31:
 wrote positive callout cache address record for okok@otherhost31
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -661,7 +661,7 @@ wrote callout cache domain record for otherhost31:
 wrote positive callout cache address record for okokok@otherhost31
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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)<<
@@ -691,12 +691,12 @@ SMTP timeout
 wrote callout cache domain record for otherhost51:
   result=1 postmaster=0 random=0
 LOG: MAIN REJECT
-  H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
+  H=(test) [V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : SMTP timeout after RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51>
 LOG: MAIN REJECT
-  H=[V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
+  H=(test) [V4NET.0.0.5] U=root F=<okok@otherhost51> temporarily rejected RCPT <z@test.ex>: Could not complete sender verify callout
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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@a.domain>
+  SMTP|> MAIL FROM:<pmsend@a.domain>
   SMTP>> RCPT TO:<postmaster@otherhost52>
   SMTP<< 250 OK
   SMTP<< 250 OK
@@ -736,7 +736,7 @@ wrote callout cache domain record for otherhost52:
 wrote positive callout cache address record for okokok@otherhost52
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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@a.domain>
+  SMTP|> MAIL FROM:<somesender@a.domain>
   SMTP>> RCPT TO:<abcd@x.y.z>
   SMTP<< 250 OK
   SMTP<< 250 OK
@@ -769,10 +769,10 @@ wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain>
 LOG: MAIN
-  <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss
+  <= ok7@otherhost53 H=(test) [V4NET.0.0.7] U=root P=smtp S=sss
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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@x.y.z>
   SMTP<< 250 OK
   SMTP(Connection timed out)<<
@@ -803,10 +803,10 @@ SMTP timeout
 wrote callout cache domain record for x.y.z:
   result=1 postmaster=0 random=0
 LOG: MAIN
-  <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss
+  <= ok7@otherhost53 H=(test) [V4NET.0.0.8] U=root P=smtp S=sss
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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
@@ -848,7 +848,7 @@ wrote callout cache domain record for otherhost9:
 wrote positive callout cache address record for ok@otherhost9
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
@@ -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@myhost.test.ex>
+  SMTP|> MAIL FROM:<postmaster@myhost.test.ex>
   SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@test.ex>
   SMTP<< 250 OK
   SMTP<< 550 RANDOM IS BAD
   SMTP>> RSET
   SMTP<< 250 OK
-  SMTP>> MAIL FROM:<postmaster@myhost.test.ex>
+  SMTP|> MAIL FROM:<postmaster@myhost.test.ex>
   SMTP>> RCPT TO:<z@test.ex>
   SMTP<< 250 OK
   SMTP<< 250 OK
 Cutthrough cancelled by presence of postmaster verify
   SMTP>> RSET
   SMTP<< 250 OK
-  SMTP>> MAIL FROM:<pmsend@b.domain>
+  SMTP|> MAIL FROM:<pmsend@b.domain>
   SMTP>> RCPT TO:<postmaster@test.ex>
   SMTP<< 250 OK
   SMTP<< 250 OK
@@ -894,4 +894,4 @@ wrote callout cache domain record for test.ex:
 wrote positive callout cache address record for z@test.ex/<postmaster@myhost.test.ex>
 LOG: smtp_connection MAIN
   SMTP connection from root closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>