DANE: Fix 2-rcpt message, diff domins case. Bug 2265

[exim.git] / test / stderr / 0364

diff --git a/test/stderr/0364 b/test/stderr/0364
index 1b08f726b8a389cd26e94abcbe6c40d62bc42462..34dc3910a662e234e2cbd2e46e059b8033fe9263 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -10,7 +10,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'kilos@thishost.test.ex'
+expanded: 'kilos@thishost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: kilos@thishost.test.ex
 extract item: kilos@thishost.test.ex
@@ -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
@@ -55,7 +55,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'solik@otherhost.test.ex'
+expanded: 'solik@otherhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: solik@otherhost.test.ex
 extract item: solik@otherhost.test.ex
@@ -81,7 +81,7 @@ checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
 rda_interpret (string): '$local_part@$original_domain.sub.test.ex'
-expanded: 'solik@otherhost.sub.test.ex'
+expanded: 'solik@otherhost.sub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: solik@otherhost.sub.test.ex
 extract item: solik@otherhost.sub.test.ex
@@ -110,7 +110,7 @@ local_part=solik domain=otherhost.sub.test.ex
 checking domains
 calling r4 router
 rda_interpret (string): ':fail:Can't route to $domain'
-expanded: ':fail:Can't route to otherhost.sub.test.ex'
+expanded: ':fail:Can't route to otherhost.sub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: :fail:Can't route to otherhost.sub.test.ex
 extract item: :fail:Can't route to otherhost.sub.test.ex
@@ -123,7 +123,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'xxx@ten-1.test.ex'
+expanded: 'xxx@ten-1.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: xxx@ten-1.test.ex
 extract item: xxx@ten-1.test.ex
@@ -145,7 +145,7 @@ 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
@@ -158,7 +158,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'xxx@testsub.test.ex'
+expanded: 'xxx@testsub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: xxx@testsub.test.ex
 extract item: xxx@testsub.test.ex
@@ -184,7 +184,7 @@ checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
 rda_interpret (string): '$local_part@$original_domain.sub.test.ex'
-expanded: 'xxx@testsub.sub.test.ex'
+expanded: 'xxx@testsub.sub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: xxx@testsub.sub.test.ex
 extract item: xxx@testsub.sub.test.ex
@@ -205,9 +205,9 @@ r2 router called for xxx@testsub.sub.test.ex
 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 (main) terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>