ACL: reword error message for ratelimit. Bug 2267

[users/jgh/exim.git] / test / stderr / 0364

diff --git a/test/stderr/0364 b/test/stderr/0364
index f648839f10cabee2b97d05e0bb4a99b7ec692196..3d11e8a9226879e026a43780e81f1d76c8b06260 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -1,11 +1,6 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

-DSN: r1 propagating DSN
-DSN: r2 propagating DSN
-DSN: r3 propagating DSN
-DSN: r4 propagating DSN
-DSN: r5 propagating DSN

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing kilos@thishost
 --------> r1 router <--------
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 routing kilos@thishost
 --------> r1 router <--------


@@ -81,7 +76,7 @@ r2 router declined for solik@otherhost.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex
 checking domains
 --------> r3 router <--------
 local_part=solik domain=otherhost.test.ex
 checking domains

-checking "condition"
+checking "condition" "${if eq{$address_data}{}{no}{yes}}"...

 processing address_data
 calling r3 router
 rda_interpret (string): $local_part@$original_domain.sub.test.ex
 processing address_data
 calling r3 router
 rda_interpret (string): $local_part@$original_domain.sub.test.ex


@@ -107,7 +102,7 @@ r2 router declined for solik@otherhost.sub.test.ex
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains
 --------> r3 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 checking domains

-checking "condition"
+checking "condition" "${if eq{$address_data}{}{no}{yes}}"...

 r3 router skipped: condition failure
 --------> r4 router <--------
 local_part=solik domain=otherhost.sub.test.ex
 r3 router skipped: condition failure
 --------> r4 router <--------
 local_part=solik domain=otherhost.sub.test.ex


@@ -184,7 +179,7 @@ r2 router declined for xxx@testsub.test.ex
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
 checking domains
 --------> r3 router <--------
 local_part=xxx domain=testsub.test.ex
 checking domains

-checking "condition"
+checking "condition" "${if eq{$address_data}{}{no}{yes}}"...

 processing address_data
 calling r3 router
 rda_interpret (string): $local_part@$original_domain.sub.test.ex
 processing address_data
 calling r3 router
 rda_interpret (string): $local_part@$original_domain.sub.test.ex


@@ -214,4 +209,4 @@ routed by r2 router
   envelope to: xxx@testsub.sub.test.ex
   transport: t1
   host testsub.sub.test.ex [V4NET.99.0.3]
   envelope to: xxx@testsub.sub.test.ex
   transport: t1
   host testsub.sub.test.ex [V4NET.99.0.3]

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>