X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/836c3e4102dae52604590a6674bec10087dbf17e..359e2110201a7d6f9c5db33f4f9be4380b3cce25:/test/stderr/0364?ds=sidebyside

diff --git a/test/stderr/0364 b/test/stderr/0364
index f3df336ad..da45f5edc 100644
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -43,7 +43,7 @@ set transport t2
 queued for t2 transport: local_part = kilos
 domain = thishost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r5 router
   envelope to: kilos@thishost.test.ex
   transport: t2
@@ -70,13 +70,16 @@ routing solik@otherhost.test.ex
 --------> r2 router <--------
 local_part=solik domain=otherhost.test.ex
 checking domains
+otherhost.test.ex in domains? yes (end of list)
 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
 checking domains
+otherhost.test.ex in domains? yes (end of list)
 checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
@@ -96,18 +99,22 @@ routing solik@otherhost.sub.test.ex
 --------> r2 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
+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
+main lookup for domain
 r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
+otherhost.sub.test.ex in domains? yes (end of list)
 checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 r3 router skipped: condition failure
 --------> r4 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
+otherhost.sub.test.ex in domains? yes (end of list)
 calling r4 router
 rda_interpret (string): ':fail:Can't route to $domain'
 expanded: ':fail:Can't route to otherhost.sub.test.ex' (tainted)
@@ -138,14 +145,16 @@ routing xxx@ten-1.test.ex
 --------> r2 router <--------
 local_part=xxx domain=ten-1.test.ex
 checking domains
+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
+main lookup for domain
 set transport t1
 queued for t1 transport: local_part = xxx
 domain = ten-1.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: xxx@ten-1.test.ex
   transport: t1
@@ -173,13 +182,16 @@ routing xxx@testsub.test.ex
 --------> r2 router <--------
 local_part=xxx domain=testsub.test.ex
 checking domains
+testsub.test.ex in domains? yes (end of list)
 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
 checking domains
+testsub.test.ex in domains? yes (end of list)
 checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
@@ -199,15 +211,17 @@ routing xxx@testsub.sub.test.ex
 --------> r2 router <--------
 local_part=xxx domain=testsub.sub.test.ex
 checking domains
+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
+main lookup for domain
 queued for t1 transport: local_part = xxx
 domain = testsub.sub.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by r2 router
   envelope to: xxx@testsub.sub.test.ex
   transport: t1
   host testsub.sub.test.ex [V4NET.99.0.3]
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>