Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0364

diff --git a/test/stderr/0364 b/test/stderr/0364
index bfac8acf29c5c8f6444ff00eaa285006bc7ef7db..4a33285162300375ace5815159d895f9d7bb479c 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -1,4 +1,5 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid


@@ -74,6 +75,7 @@ otherhost.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for solik@otherhost.test.ex
   domain = otherhost.test.ex
 calling r2 router
 r2 router called for solik@otherhost.test.ex
   domain = otherhost.test.ex

+main lookup for domain

 r2 router declined for solik@otherhost.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex
 r2 router declined for solik@otherhost.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex


@@ -102,6 +104,7 @@ otherhost.sub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for solik@otherhost.sub.test.ex
   domain = otherhost.sub.test.ex
 calling r2 router
 r2 router called for solik@otherhost.sub.test.ex
   domain = otherhost.sub.test.ex

+main lookup for domain

 r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex


@@ -147,6 +150,7 @@ ten-1.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@ten-1.test.ex
   domain = ten-1.test.ex
 calling r2 router
 r2 router called for xxx@ten-1.test.ex
   domain = ten-1.test.ex

+main lookup for domain

 set transport t1
 queued for t1 transport: local_part = xxx
 domain = ten-1.test.ex
 set transport t1
 queued for t1 transport: local_part = xxx
 domain = ten-1.test.ex


@@ -183,6 +187,7 @@ testsub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@testsub.test.ex
   domain = testsub.test.ex
 calling r2 router
 r2 router called for xxx@testsub.test.ex
   domain = testsub.test.ex

+main lookup for domain

 r2 router declined for xxx@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
 r2 router declined for xxx@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex


@@ -211,6 +216,7 @@ testsub.sub.test.ex in domains? yes (end of list)
 calling r2 router
 r2 router called for xxx@testsub.sub.test.ex
   domain = testsub.sub.test.ex
 calling r2 router
 r2 router called for xxx@testsub.sub.test.ex
   domain = testsub.sub.test.ex

+main lookup for domain

 queued for t1 transport: local_part = xxx
 domain = testsub.sub.test.ex
   errors_to=NULL
 queued for t1 transport: local_part = xxx
 domain = testsub.sub.test.ex
   errors_to=NULL