Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0261

diff --git a/test/stderr/0261 b/test/stderr/0261
index 04219b0b5962802dcd6d467f1f33f4a59324245b..50f388301eac15dbb2377d7843d6457f319bf716 100644 (file)
--- a/test/stderr/0261
+++ b/test/stderr/0261
@@ -1,6 +1,6 @@
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
-delivering 10HmaX-0005vi-00
+delivering 10HmaX-000000005vi-0000
 LOG: MAIN PANIC
   == bad.return@test.ex R=bad_return T=bad_return defer (-1): Failed to expand return path "${if": condition name expected, but found ""
 LOG: MAIN PANIC
@@ -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]
-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
+  *> 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-000000005vi-0000 == 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-000000005vi-0000 == 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-000000005vi-0000 == no.hosts@test.ex R=no_hosts T=no_hosts defer (-1): no_hosts transport called with no hosts set