Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 0149

diff --git a/test/stderr/0149 b/test/stderr/0149
index ded70e577ccb76d042bbb276bf197f3562e92d35..954ec58cd45a8e47a8db112fe0279241f0f45ca6 100644 (file)
--- a/test/stderr/0149
+++ b/test/stderr/0149
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -6,6 +7,8 @@ routing x@ten
 --------> domainlist1 router <--------
 local_part=x domain=ten
 checking domains
+ten in " test1 - test2-test3--4"? no (end of list)
+ten in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@ten
   domain = ten
@@ -19,10 +22,10 @@ calling host_find_byname
 queued for <unset> transport: local_part = x
 domain = ten
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
-  envelope to: x@ten
-  transport: <none>
+  envelope to: x@ten
+  transport:   <none>
   host V4NET.0.0.0 [V4NET.0.0.0]
   host V4NET.0.0.1 [V4NET.0.0.1]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -30,10 +33,13 @@ routing y@two
 --------> domainlist1 router <--------
 local_part=y domain=two
 checking domains
+two in " test1 - test2-test3--4"? no (end of list)
+two in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for y@two
   domain = two
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
+two in "ten"? no (end of list)
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
 original list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
 expanded list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
@@ -44,10 +50,10 @@ calling host_find_byname
 queued for <unset> transport: local_part = y
 domain = two
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist1 router
-  envelope to: y@two
-  transport: <none>
+  envelope to: y@two
+  transport:   <none>
   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -69,10 +75,10 @@ set transport local_delivery
 queued for local_delivery transport: local_part = x
 domain = test1
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by local router
-  envelope to: x@test1
-  transport: local_delivery
+  envelope to: x@test1
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test2
 --------> domainlist1 router <--------
@@ -91,10 +97,10 @@ local router called for x@test2
 queued for local_delivery transport: local_part = x
 domain = test2
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by local router
-  envelope to: x@test2
-  transport: local_delivery
+  envelope to: x@test2
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@test3-4
 --------> domainlist1 router <--------
@@ -113,28 +119,34 @@ local router called for x@test3-4
 queued for local_delivery transport: local_part = x
 domain = test3-4
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by local router
-  envelope to: x@test3-4
-  transport: local_delivery
+  envelope to: x@test3-4
+  transport:   local_delivery
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing x@one
 --------> domainlist1 router <--------
 local_part=x domain=one
 checking domains
+one in " test1 - test2-test3--4"? no (end of list)
+one in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@one
   domain = one
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
+one in "ten"? no (end of list)
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
+one in "two"? no (end of list)
 domainlist1 router declined for x@one
 --------> domainlist2 router <--------
 local_part=x domain=one
 checking domains
+one in domains? yes (end of list)
 calling domainlist2 router
 domainlist2 router called for x@one
   domain = one
 route_item = six <+V4NET.0.0.6+V4NET.0.0.7 byname
+one in "six"? no (end of list)
 route_item = one   V4NET.0.0.2:V4NET.0.0.4 byname
 original list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
 expanded list of hosts = 'V4NET.0.0.2:V4NET.0.0.4' options = 'byname'
@@ -145,10 +157,10 @@ calling host_find_byname
 queued for <unset> transport: local_part = x
 domain = one
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
-  envelope to: x@one
-  transport: <none>
+  envelope to: x@one
+  transport:   <none>
   host V4NET.0.0.2 [V4NET.0.0.2]
   host V4NET.0.0.4 [V4NET.0.0.4]
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -156,15 +168,20 @@ routing x@six
 --------> domainlist1 router <--------
 local_part=x domain=six
 checking domains
+six in " test1 - test2-test3--4"? no (end of list)
+six in domains? yes (end of list)
 calling domainlist1 router
 domainlist1 router called for x@six
   domain = six
 route_item = ten <+V4NET.0.0.0+V4NET.0.0.1 byname
+six in "ten"? no (end of list)
 route_item = two   V4NET.0.0.2:V4NET.0.0.4 byname
+six in "two"? no (end of list)
 domainlist1 router declined for x@six
 --------> domainlist2 router <--------
 local_part=x domain=six
 checking domains
+six in domains? yes (end of list)
 calling domainlist2 router
 domainlist2 router called for x@six
   domain = six
@@ -178,10 +195,10 @@ calling host_find_byname
 queued for <unset> transport: local_part = x
 domain = six
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by domainlist2 router
-  envelope to: x@six
-  transport: <none>
+  envelope to: x@six
+  transport:   <none>
   host V4NET.0.0.6 [V4NET.0.0.6]
   host V4NET.0.0.7 [V4NET.0.0.7]
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>