Make +smtp_confirmation be a default logging option.

23 files changed, 59 insertions, 59 deletions

diff --git a/test/stderr/0039 b/test/stderr/0039
index 3dcf023c0..7d8121912 100644
--- a/test/stderr/0039
+++ b/test/stderr/0039
@@ -2,17 +2,17 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
-  *> newr1@myhost.test.ex <r1@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0]
+  *> newr1@myhost.test.ex <r1@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> newr2@local.test.ex <r2@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0]
+  *> newr2@local.test.ex <r2@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@qd.text.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
 LOG: MAIN
-  *> newr1@qd.text.ex <r1@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0]
+  *> newr1@qd.text.ex <r1@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> newr2@local.test.ex <r2@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0]
+  *> newr2@local.test.ex <r2@test.ex> R=ok T=t1 H=V4NET.0.0.0 [V4NET.0.0.0] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
diff --git a/test/stderr/0055 b/test/stderr/0055
index 49dc73658..c9729ad2e 100644
--- a/test/stderr/0055
+++ b/test/stderr/0055
@@ -21,7 +21,7 @@ LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbB-0005vi-00
 LOG: MAIN
-  *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
@@ -33,7 +33,7 @@ LOG: queue_run MAIN
   Start queue run: pid=pppp
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
 LOG: MAIN
-  *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2]
+  *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: queue_run MAIN
@@ -44,12 +44,12 @@ delivering 10HmbD-0005vi-00 (queue run pid ppppp)
 delivering 10HmbE-0005vi-00 (queue run pid ppppp)
 delivering 10HmbD-0005vi-00 (queue run pid ppppp)
 LOG: MAIN
-  *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xxx@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 delivering 10HmbE-0005vi-00 (queue run pid ppppp)
 LOG: MAIN
-  *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> yyy@ten-1.test.ex R=lookuphost T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: queue_run MAIN
@@ -61,7 +61,7 @@ LOG: MAIN
   == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
 delivering 10HmbF-0005vi-00
 LOG: MAIN
-  *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2]
+  *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
diff --git a/test/stderr/0108 b/test/stderr/0108
index 9693fbfb0..489565dec 100644
--- a/test/stderr/0108
+++ b/test/stderr/0108
@@ -2,25 +2,25 @@ LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
-  *> xx@black.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@black.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> xx@myhost.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@myhost.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> xx@other.edu R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@other.edu R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> xx@ten-1.net R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@ten-1.net R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
 LOG: MAIN
-  *> xx@black.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@black.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> xx@myhost.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@myhost.com R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> xx@other.edu R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@other.edu R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> xx@ten-1.net R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1]
+  *> xx@ten-1.net R=remote T=smtp H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
diff --git a/test/stderr/0143 b/test/stderr/0143
index 06ddcd7cf..3373ded2e 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -38,7 +38,7 @@ no messages waiting for 127.0.0.1
   SMTP>> QUIT
 Leaving smtp transport
 LOG: MAIN
-  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0217 b/test/stderr/0217
index 32b046de1..4567dd3d7 100644
--- a/test/stderr/0217
+++ b/test/stderr/0217
@@ -252,12 +252,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
+  => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
-  -> x@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
+  -> x@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
-  -> y@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
+  -> y@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
-  -> z@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
+  -> z@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
diff --git a/test/stderr/0218 b/test/stderr/0218
index cbec285ef..67ae81ee6 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -23,7 +23,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP>> writing message and terminating "."
   SMTP<< 250 OK
 LOG: MAIN
-  => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]
+  => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 Exim version x.yz ....
@@ -41,7 +41,7 @@ delivering 10HmaY-0005vi-00 (queue run pid ppppp)
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]*
+  => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -145,7 +145,7 @@ delivering 10HmbC-0005vi-00 (queue run pid ppppp)
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]*
+  => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0261 b/test/stderr/0261
index 04219b0b5..a8bff050c 100644
--- a/test/stderr/0261
+++ b/test/stderr/0261
@@ -8,7 +8,7 @@ LOG: MAIN PANIC
 LOG: MAIN PANIC
   == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set
 LOG: MAIN
-  *> userx@test.ex R=good T=remote_delivery H=V4NET.0.0.1 [V4NET.0.0.1]
+  *> userx@test.ex R=good T=remote_delivery H=V4NET.0.0.1 [V4NET.0.0.1] C="delivery bypassed by -N option"
 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found ""
 1999-03-02 09:44:33 10HmaX-0005vi-00 == bad.return2@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found ""
 1999-03-02 09:44:33 10HmaX-0005vi-00 == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set
diff --git a/test/stderr/0292 b/test/stderr/0292
index 70b4574e4..f88c6b03c 100644
--- a/test/stderr/0292
+++ b/test/stderr/0292
@@ -6,6 +6,6 @@ LOG: MAIN
   *> userx@t1 R=r1 T=t1 H=host.1:host.2
 $host=127.0.0.1 $host_address=127.0.0.1
 LOG: MAIN
-  *> userx@t2 R=r2 T=t2 H=127.0.0.1 [127.0.0.1]
+  *> userx@t2 R=r2 T=t2 H=127.0.0.1 [127.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
diff --git a/test/stderr/0315 b/test/stderr/0315
index 01922fbe5..80a16f562 100644
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -49,9 +49,9 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]
+  *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]
+  *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -125,9 +125,9 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2]
+  *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
-  *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2]
+  *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0332 b/test/stderr/0332
index 70e7dc6e6..d77834753 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -34,7 +34,7 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 Exim version x.yz ....
@@ -78,7 +78,7 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]*
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 locking TESTSUITE/spool/db/retry.lockfile
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/test/stderr/0333 b/test/stderr/0333
index 6cf0421cd..b7c11d62c 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -32,7 +32,7 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -77,5 +77,5 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]*
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK"
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/0360 b/test/stderr/0360
index 76b521668..70b77eb2b 100644
--- a/test/stderr/0360
+++ b/test/stderr/0360
@@ -143,7 +143,7 @@ After routing:
     defer@test.ex
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
-  *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2]
+  *> unknown@recurse.test.ex.test.ex <cms@test.ex> R=r1 T=t1 H=recurse.test.ex.test.ex [V4NET.99.0.2] C="delivery bypassed by -N option"
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
diff --git a/test/stderr/0374 b/test/stderr/0374
index 2fafefb7e..cf1104120 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -367,7 +367,7 @@ LOG: MAIN
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
-  => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]
+  => d1@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   == d2@myhost.test.ex R=ut4 T=ut4 defer (-44): SMTP error from remote mail server after RCPT TO:<d2@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 soft error
diff --git a/test/stderr/0375 b/test/stderr/0375
index 628b5dfcb..37ed2d839 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -802,7 +802,7 @@ log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut4.lockfile
 LOG: MAIN
-  => d1@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]
+  => d1@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
@@ -821,7 +821,7 @@ log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-ut6.lockfile
 LOG: MAIN
-  => f1@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]
+  => f1@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
diff --git a/test/stderr/0467 b/test/stderr/0467
index 60aed5cd3..ec84ba9c0 100644
--- a/test/stderr/0467
+++ b/test/stderr/0467
@@ -2,14 +2,14 @@ LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaX-0005vi-00
 LOG: MAIN
-  *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25
+  *> x@srv01.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]:25 C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 delivering 10HmaY-0005vi-00
 LOG: MAIN
-  *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88
+  *> x@srv03.test.ex R=r1 T=t1 H=ten-4.test.ex [V4NET.0.0.4]:88 C="delivery bypassed by -N option"
 LOG: MAIN
   Completed
 LOG: MAIN
@@ -31,6 +31,6 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224
+  => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK"
 LOG: MAIN
   Completed
diff --git a/test/stderr/0543 b/test/stderr/0543
index 655762d0a..3aa07da74 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -33,7 +33,7 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-smtp.lockfile
 LOG: MAIN
-  => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1]
+  => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 locking TESTSUITE/spool/db/retry.lockfile
diff --git a/test/stderr/0554 b/test/stderr/0554
index edd4036c9..17e8f4da4 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -75,7 +75,7 @@ reading retry information for R:x@y:<CALLER@myhost.test.ex> from subprocess
   existing delete item dropped
   added delete item
 LOG: MAIN
-  => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1]
+  => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 Processing retry items
 Succeeded addresses:
 x@y
diff --git a/test/stderr/2108 b/test/stderr/2108
index 74d6a2115..743f7ba71 100644
--- a/test/stderr/2108
+++ b/test/stderr/2108
@@ -28,7 +28,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
   SMTP<< 250 OK id=10HmaZ-0005vi-00
   SMTP>> QUIT
 LOG: MAIN
-  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock"
+  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
 LOG: MAIN
   Completed
 delivering 10HmaY-0005vi-00 (queue run pid ppppp)
@@ -61,9 +61,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
   SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP>> QUIT
 LOG: MAIN
-  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock"
+  => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
 LOG: MAIN
-  -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock"
+  -> xyz@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
 Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> EHLO myhost.test.ex
@@ -91,7 +91,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected
   SMTP<< 250 OK id=10HmbB-0005vi-00
   SMTP>> QUIT
 LOG: MAIN
-  => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock"
+  => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00"
 LOG: MAIN
   Completed
 LOG: queue_run MAIN
diff --git a/test/stderr/2113 b/test/stderr/2113
index 97afb2870..10c7e8022 100644
--- a/test/stderr/2113
+++ b/test/stderr/2113
@@ -35,7 +35,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected
          250-STARTTLS
          250 HELP
 LOG: MAIN
-  => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock"
+  => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00"
 LOG: MAIN
   Completed
 Exim version x.yz ....
@@ -59,7 +59,7 @@ admin user
   SMTP<< 250 OK id=10HmbA-0005vi-00
   SMTP>> QUIT
 LOG: MAIN
-  => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock"
+  => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:AES256-SHA:256 DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/3404 b/test/stderr/3404
index fa3e33298..754e8938a 100644
--- a/test/stderr/3404
+++ b/test/stderr/3404
@@ -19,7 +19,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
@@ -43,7 +43,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 LOG: MAIN
@@ -71,6 +71,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected
   SMTP<< 250 OK
   SMTP>> QUIT
 LOG: MAIN
-  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
diff --git a/test/stderr/5400 b/test/stderr/5400
index 11c861ba7..bc3dba5dd 100644
--- a/test/stderr/5400
+++ b/test/stderr/5400
@@ -30,7 +30,7 @@ accept: condition test succeeded in inline ACL
   SMTP>> .
   SMTP<< 250 OK
 LOG: MAIN
-  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -73,7 +73,7 @@ accept: condition test succeeded in inline ACL
   SMTP>> .
   SMTP<< 250 OK
 LOG: MAIN
-  >> userz@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  >> userz@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
@@ -157,9 +157,9 @@ no messages waiting for 127.0.0.1
   SMTP>> QUIT
 Leaving smtp transport
 LOG: MAIN
-  => usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  => usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
-  -> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  -> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
diff --git a/test/stderr/5401 b/test/stderr/5401
index 91f453e7c..135c11ace 100644
--- a/test/stderr/5401
+++ b/test/stderr/5401
@@ -27,7 +27,7 @@ accept: condition test succeeded in inline ACL
   SMTP>> .
   SMTP<< 250 OK
 LOG: MAIN
-  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1]
+  >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK"
 created log directory TESTSUITE/spool/log
   SMTP>> QUIT
 ----------- cutthrough shutdown (delivered) ------------
diff --git a/test/stderr/9901 b/test/stderr/9901
index 53fe15d6a..329666f04 100644
--- a/test/stderr/9901
+++ b/test/stderr/9901
@@ -35,7 +35,7 @@ After routing:
 locking TESTSUITE/spool/db/retry.lockfile
 locking TESTSUITE/spool/db/wait-t1.lockfile
 LOG: MAIN
-  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]
+  => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00"
 LOG: MAIN
   Completed
 Exim version x.yz ....