wip

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

diff --git a/test/stderr/0055 b/test/stderr/0055
index c9729ad2ea5139ef2dce4f69d8ad0db9cc92bc7d..71884fec75402d894a0fa59531e4d3ed681ff112 100644 (file)
--- a/test/stderr/0055
+++ b/test/stderr/0055
@@ -16,7 +16,7 @@ LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00
 LOG: retry_defer MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmaZ-0005vi-00
 LOG: retry_defer MAIN

-  == xxx@local.test.ex routing defer (-55): domain is in queue_domains
+  == xxx@local.test.ex routing defer (-56): domain is in queue_domains

 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


@@ -28,10 +28,10 @@ LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbC-0005vi-00
 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
 LOG: queue_run MAIN
   Start queue run: pid=pppp

-delivering 10HmbC-0005vi-00 (queue run pid ppppp)
+delivering 10HmbC-0005vi-00 (queue run pid pppp)

 LOG: MAIN
   *> 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
 LOG: MAIN
   *> 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


@@ -40,14 +40,14 @@ LOG: queue_run MAIN
   End queue run: pid=pppp
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qq
   End queue run: pid=pppp
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qq

-delivering 10HmbD-0005vi-00 (queue run pid ppppp)
-delivering 10HmbE-0005vi-00 (queue run pid ppppp)
-delivering 10HmbD-0005vi-00 (queue run pid ppppp)
+delivering 10HmbD-0005vi-00 (queue run pid pppp)
+delivering 10HmbE-0005vi-00 (queue run pid pppp)
+delivering 10HmbD-0005vi-00 (queue run pid pppp)

 LOG: MAIN
   *> 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
   *> 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)
+delivering 10HmbE-0005vi-00 (queue run pid pppp)

 LOG: MAIN
   *> 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
 LOG: MAIN
   *> 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


@@ -58,7 +58,7 @@ 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
   *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"
 delivering 10HmbF-0005vi-00
 LOG: MAIN
   *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"


@@ -68,7 +68,7 @@ LOG: MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbG-0005vi-00
 LOG: retry_defer MAIN
   <= CALLER@myhost.ex U=CALLER P=local S=sss
 delivering 10HmbG-0005vi-00
 LOG: retry_defer MAIN

-  == xxx@local.test.ex routing defer (-55): domain is in queue_domains
+  == xxx@local.test.ex routing defer (-56): domain is in queue_domains

 delivering 10HmbG-0005vi-00
 LOG: MAIN
   *> xxx@local.test.ex R=localreally T=local_delivery
 delivering 10HmbG-0005vi-00
 LOG: MAIN
   *> xxx@local.test.ex R=localreally T=local_delivery