Transports: pass back next id for continued-transport

[exim.git] / test / stderr / 0161

diff --git a/test/stderr/0161 b/test/stderr/0161
index dad95576f1a12eb2ea2fc9b8199db207363df8df..75986186e64161ec0ae770a650163036a2683c7b 100644 (file)
--- a/test/stderr/0161
+++ b/test/stderr/0161
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -7,14 +8,19 @@ routing xx@mxt6.test.ex
 --------> failuphost router <--------
 local_part=xx domain=mxt6.test.ex
 checking domains
+mxt6.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt6.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xx domain=mxt6.test.ex
 checking domains
+mxt6.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt6.test.ex
   domain = mxt6.test.ex
+main lookup for domain
 set transport remote_smtp
 queued for remote_smtp transport: local_part = xx
 domain = mxt6.test.ex
@@ -26,6 +32,7 @@ routed by lookuphost router
   host ten-1.test.ex [V4NET.0.0.1] MX=5 dnssec=no
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -34,24 +41,32 @@ routing myhost.test.ex@mxt1.test.ex
 --------> failuphost router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+myhost.test.ex in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for myhost.test.ex@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for myhost.test.ex@mxt1.test.ex
 --------> fail router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+myhost.test.ex in local_parts? no (end of list)
 fail router skipped: local_parts mismatch
 --------> self router <--------
 local_part=myhost.test.ex domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 self_hostname=eximtesthost.test.ex
 calling self router
 self router called for myhost.test.ex@mxt1.test.ex
@@ -72,6 +87,7 @@ routed by self router
   host myhost.test.ex [V4NET.10.10.10]
 >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -80,24 +96,32 @@ routing xx@mxt1.test.ex
 --------> failuphost router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for xx@mxt1.test.ex
 --------> fail router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 fail router skipped: local_parts mismatch
 --------> self router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 self_hostname=eximtesthost.test.ex
 calling self router
 self router called for xx@mxt1.test.ex
@@ -112,6 +136,7 @@ self router passed for xx@mxt1.test.ex
 --------> self2 router <--------
 local_part=xx domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 self_hostname=eximtesthost.test.ex
 calling self2 router
 self2 router called for xx@mxt1.test.ex
@@ -132,6 +157,7 @@ routed by self2 router
   host myhost.test.ex [V4NET.10.10.10]
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -140,19 +166,25 @@ routing xx@not-exist.test.ex
 --------> failuphost router <--------
 local_part=xx domain=not-exist.test.ex
 checking domains
+not-exist.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+not-exist.test.ex in domains? yes (end of list)
 checking local_parts
+xx in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=xx domain=not-exist.test.ex
 checking domains
+not-exist.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for xx@not-exist.test.ex
   domain = not-exist.test.ex
+main lookup for domain
 lookuphost router declined for xx@not-exist.test.ex
 "more" is false: skipping remaining routers
 no more routers
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -161,14 +193,18 @@ routing ff@mxt1.test.ex
 --------> failuphost router <--------
 local_part=ff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
 calling failuphost router
 failuphost router called for ff@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: address failed (self = fail)
 failuphost router forced address failure
 >>>>>>>>>>>>>>>> Exim pid=p1238 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -177,19 +213,25 @@ routing fff@mxt1.test.ex
 --------> failuphost router <--------
 local_part=fff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in "test.ex : myhost.test.ex"? no (end of list)
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
+fff in local_parts? no (end of list)
 failuphost router skipped: local_parts mismatch
 --------> lookuphost router <--------
 local_part=fff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 calling lookuphost router
 lookuphost router called for fff@mxt1.test.ex
   domain = mxt1.test.ex
+main lookup for domain
 lowest numbered MX record points to local host: mxt1.test.ex: passed to next router (self = pass)
 lookuphost router passed for fff@mxt1.test.ex
 --------> fail router <--------
 local_part=fff domain=mxt1.test.ex
 checking domains
+mxt1.test.ex in domains? yes (end of list)
 checking local_parts
 self_hostname=eximtesthost.test.ex
 calling fail router