Fix $local_part_verified for remote-delivery routing following local. Bug 2565

[users/heiko/exim.git] / test / stderr / 0055

diff --git a/test/stderr/0055 b/test/stderr/0055
index 49dc73658248dedfac6bb8657cffe14af60cc228..e3789a44ce8b4ee0675a598ab2402d8eb3236e16 100644 (file)
--- a/test/stderr/0055
+++ b/test/stderr/0055
@@ -21,19 +21,19 @@ LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbB-0005vi-00
 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
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbC-0005vi-00
 LOG: MAIN
 LOG: MAIN
   Completed
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbC-0005vi-00
 LOG: MAIN

-  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
+  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue

 LOG: queue_run MAIN
   Start queue run: pid=pppp
 delivering 10HmbC-0005vi-00 (queue run pid ppppp)
 LOG: MAIN
 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
 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
 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
 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
 LOG: MAIN
   Completed
 LOG: queue_run MAIN


@@ -58,10 +58,10 @@ LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbF-0005vi-00
 LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbF-0005vi-00
 LOG: MAIN

-  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
+  == xxx@ten-2.test.ex R=lookuphost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue

 delivering 10HmbF-0005vi-00
 LOG: MAIN
 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
 LOG: MAIN
   Completed
 LOG: MAIN