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

[exim.git] / test / stderr / 0414

diff --git a/test/stderr/0414 b/test/stderr/0414
index 9ec9025349bf0abf1b6426441192b4c9dbbec45f..e4f64719612372e60e1689fb8aa5163bdb9c72d3 100644 (file)
--- a/test/stderr/0414
+++ b/test/stderr/0414
@@ -43,9 +43,9 @@ file lookup required for b.domain
   in TESTSUITE/aux-fixed/0414.list2
 lookup yielded: b.domain-data
 b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")
   in TESTSUITE/aux-fixed/0414.list2
 lookup yielded: b.domain-data
 b.domain in "lsearch;TESTSUITE/aux-fixed/0414.list2"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list2")

-data from lookup saved for cache for +B: b.domain-data
+data from lookup saved for cache for +B: key 'b.domain' value 'b.domain-data'

 b.domain in "+A : +B"? yes (matched "+B")
 b.domain in "+A : +B"? yes (matched "+B")

-data from lookup saved for cache for +C: b.domain-data
+data from lookup saved for cache for +C: key 'b.domain' value 'b.domain-data'

 b.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 b.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------


@@ -62,7 +62,7 @@ set transport t1
 queued for t1 transport: local_part = x
 domain = b.domain
   errors_to=NULL
 queued for t1 transport: local_part = x
 domain = b.domain
   errors_to=NULL

-  domain_data=b.domain-data localpart_data=NULL
+  domain_data=b.domain-data local_part_data=NULL

 routed by r2 router
   envelope to: x@b.domain
   transport: t1
 routed by r2 router
   envelope to: x@b.domain
   transport: t1


@@ -89,9 +89,9 @@ file lookup required for a.domain
   in TESTSUITE/aux-fixed/0414.list1
 lookup yielded: a.domain-data
 a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")
   in TESTSUITE/aux-fixed/0414.list1
 lookup yielded: a.domain-data
 a.domain in "lsearch;TESTSUITE/aux-fixed/0414.list1"? yes (matched "lsearch;TESTSUITE/aux-fixed/0414.list1")

-data from lookup saved for cache for +A: a.domain-data
+data from lookup saved for cache for +A: key 'a.domain' value 'a.domain-data'

 a.domain in "+A : +B"? yes (matched "+A")
 a.domain in "+A : +B"? yes (matched "+A")

-data from lookup saved for cache for +C: a.domain-data
+data from lookup saved for cache for +C: key 'a.domain' value 'a.domain-data'

 a.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 a.domain in "!+C"? no (matched "!+C")
 r1 router skipped: domains mismatch
 --------> r2 router <--------


@@ -127,7 +127,7 @@ set transport t1
 queued for t1 transport: local_part = x
 domain = a.domain
   errors_to=NULL
 queued for t1 transport: local_part = x
 domain = a.domain
   errors_to=NULL

-  domain_data=a.domain-data localpart_data=NULL
+  domain_data=a.domain-data local_part_data=NULL

 routed by r3 router
   envelope to: x@a.domain
   transport: t1
 routed by r3 router
   envelope to: x@a.domain
   transport: t1