Pass back more info from transport to delivery process

[exim.git] / test / stderr / 0085

diff --git a/test/stderr/0085 b/test/stderr/0085
index 520e9de95da9b6a70fa7cee1f1a2111aa1e5a543..6637329c89fe063132eb56554e1d2a294b6115b2 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
@@ -19,22 +20,22 @@ routing x@y.z
 --------> smart1 router <--------
 local_part=x domain=y.z
 checking domains
-y.z in "smart.domain"?
+y.z in domains?
  list element: smart.domain
-y.z in "smart.domain"? no (end of list)
+y.z in domains? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=y.z
 checking domains
-y.z in "! +local_domains"?
- list element: ! +local_domains
+y.z in domains?
+ list element: !░+local_domains
   start sublist local_domains
    y.z in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
    ╎list element: myhost.test.ex
    y.z in "test.ex : myhost.test.ex"? no (end of list)
   end sublist local_domains
-y.z in "! +local_domains"? yes (end of list)
+y.z in domains? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
 expanded: ':fail: unrouteable mail domain "y.z"' (tainted)
@@ -51,9 +52,9 @@ routing x@smart.domain
 --------> smart1 router <--------
 local_part=x domain=smart.domain
 checking domains
-smart.domain in "smart.domain"?
+smart.domain in domains?
  list element: smart.domain
- smart.domain in "smart.domain"? yes (matched "smart.domain")
+ smart.domain in domains? yes (matched "smart.domain")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
  search_find: file="TESTSUITE/aux-fixed/0085.data"
@@ -66,10 +67,10 @@ checking local_parts
  file lookup required for smart.domain
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
- lookup yielded: x : y : abc@d.e.f
-x in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+x in local_parts?
  list element: x
- x in "x : y : abc@d.e.f"? yes (matched "x")
+ x in local_parts? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -82,8 +83,8 @@ checking senders
    type=lsearch key="smart.domain" opts=NULL
  cached data used for lookup of smart.domain
    in TESTSUITE/aux-fixed/0085.data
- lookup yielded: x : y : abc@d.e.f
-abc@d.e.f in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+abc@d.e.f in senders?
  list element: x
  address match test: subject=abc@d.e.f pattern=x
  d.e.f in "x"?
@@ -99,7 +100,7 @@ abc@d.e.f in "x : y : abc@d.e.f"?
  d.e.f in "d.e.f"?
   list element: d.e.f
   d.e.f in "d.e.f"? yes (matched "d.e.f")
- abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
+ abc@d.e.f in senders? yes (matched "abc@d.e.f")
 calling smart1 router
 smart1 router called for x@smart.domain
   domain = smart.domain
@@ -125,29 +126,29 @@ routing x@test.ex
 --------> smart1 router <--------
 local_part=x domain=test.ex
 checking domains
-test.ex in "smart.domain"?
+test.ex in domains?
  list element: smart.domain
-test.ex in "smart.domain"? no (end of list)
+test.ex in domains? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=test.ex
 checking domains
-test.ex in "! +local_domains"?
- list element: ! +local_domains
+test.ex in domains?
+ list element: !░+local_domains
   start sublist local_domains
    test.ex in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
    ╎test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
   end sublist local_domains
  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
- test.ex in "! +local_domains"? no (matched "! +local_domains")
+ test.ex in domains? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=test.ex
 checking domains
-test.ex in "test.ex"?
+test.ex in domains?
  list element: test.ex
- test.ex in "test.ex"? yes (matched "test.ex")
+ test.ex in domains? yes (matched "test.ex")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -161,10 +162,10 @@ checking local_parts
  file lookup required for test.ex
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
- lookup yielded: x : y : abc@d.e.f
-x in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+x in local_parts?
  list element: x
- x in "x : y : abc@d.e.f"? yes (matched "x")
+ x in local_parts? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -177,8 +178,8 @@ checking senders
    type=lsearch key="test.ex" opts=NULL
  cached data used for lookup of test.ex
    in TESTSUITE/aux-fixed/0085.data
- lookup yielded: x : y : abc@d.e.f
-abc@d.e.f in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+abc@d.e.f in senders?
  list element: x
  address match test: subject=abc@d.e.f pattern=x
  d.e.f in "x"?
@@ -194,7 +195,7 @@ abc@d.e.f in "x : y : abc@d.e.f"?
  d.e.f in "d.e.f"?
   list element: d.e.f
   d.e.f in "d.e.f"? yes (matched "d.e.f")
- abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
+ abc@d.e.f in senders? yes (matched "abc@d.e.f")
 checking require_files
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -232,15 +233,15 @@ routing x@myhost.test.ex
 --------> smart1 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-myhost.test.ex in "smart.domain"?
+myhost.test.ex in domains?
  list element: smart.domain
-myhost.test.ex in "smart.domain"? no (end of list)
+myhost.test.ex in domains? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-myhost.test.ex in "! +local_domains"?
- list element: ! +local_domains
+myhost.test.ex in domains?
+ list element: !░+local_domains
   start sublist local_domains
    myhost.test.ex in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
@@ -248,19 +249,20 @@ myhost.test.ex in "! +local_domains"?
    ╎myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
   end sublist local_domains
  data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
- myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
+ myhost.test.ex in domains? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-myhost.test.ex in "test.ex"?
+myhost.test.ex in domains?
  list element: test.ex
-myhost.test.ex in "test.ex"? no (end of list)
+myhost.test.ex in domains? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config
@@ -281,22 +283,22 @@ routing x@y.z
 --------> smart1 router <--------
 local_part=x domain=y.z
 checking domains
-y.z in "smart.domain"?
+y.z in domains?
  list element: smart.domain
-y.z in "smart.domain"? no (end of list)
+y.z in domains? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=y.z
 checking domains
-y.z in "! +local_domains"?
- list element: ! +local_domains
+y.z in domains?
+ list element: !░+local_domains
   start sublist local_domains
    y.z in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
    ╎list element: myhost.test.ex
    y.z in "test.ex : myhost.test.ex"? no (end of list)
   end sublist local_domains
-y.z in "! +local_domains"? yes (end of list)
+y.z in domains? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
 expanded: ':fail: unrouteable mail domain "y.z"' (tainted)
@@ -313,9 +315,9 @@ routing x@smart.domain
 --------> smart1 router <--------
 local_part=x domain=smart.domain
 checking domains
-smart.domain in "smart.domain"?
+smart.domain in domains?
  list element: smart.domain
- smart.domain in "smart.domain"? yes (matched "smart.domain")
+ smart.domain in domains? yes (matched "smart.domain")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
  search_find: file="TESTSUITE/aux-fixed/0085.data"
@@ -328,10 +330,10 @@ checking local_parts
  file lookup required for smart.domain
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
- lookup yielded: x : y : abc@d.e.f
-x in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+x in local_parts?
  list element: x
- x in "x : y : abc@d.e.f"? yes (matched "x")
+ x in local_parts? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -344,8 +346,8 @@ checking senders
    type=lsearch key="smart.domain" opts=NULL
  cached data used for lookup of smart.domain
    in TESTSUITE/aux-fixed/0085.data
- lookup yielded: x : y : abc@d.e.f
-CALLER@myhost.test.ex in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+CALLER@myhost.test.ex in senders?
  list element: x
  address match test: subject=CALLER@myhost.test.ex pattern=x
  myhost.test.ex in "x"?
@@ -358,20 +360,20 @@ CALLER@myhost.test.ex in "x : y : abc@d.e.f"?
  myhost.test.ex in "y"? no (end of list)
  list element: abc@d.e.f
  address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
-CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 smart1 router skipped: senders mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=smart.domain
 checking domains
-smart.domain in "! +local_domains"?
- list element: ! +local_domains
+smart.domain in domains?
+ list element: !░+local_domains
   start sublist local_domains
    smart.domain in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
    ╎list element: myhost.test.ex
    smart.domain in "test.ex : myhost.test.ex"? no (end of list)
   end sublist local_domains
-smart.domain in "! +local_domains"? yes (end of list)
+smart.domain in domains? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
 expanded: ':fail: unrouteable mail domain "smart.domain"' (tainted)
@@ -388,29 +390,29 @@ routing x@test.ex
 --------> smart1 router <--------
 local_part=x domain=test.ex
 checking domains
-test.ex in "smart.domain"?
+test.ex in domains?
  list element: smart.domain
-test.ex in "smart.domain"? no (end of list)
+test.ex in domains? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=test.ex
 checking domains
-test.ex in "! +local_domains"?
- list element: ! +local_domains
+test.ex in domains?
+ list element: !░+local_domains
   start sublist local_domains
    test.ex in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
    ╎test.ex in "test.ex : myhost.test.ex"? yes (matched "test.ex")
   end sublist local_domains
  data from lookup saved for cache for +local_domains: key 'test.ex' value 'test.ex'
- test.ex in "! +local_domains"? no (matched "! +local_domains")
+ test.ex in domains? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=test.ex
 checking domains
-test.ex in "test.ex"?
+test.ex in domains?
  list element: test.ex
- test.ex in "test.ex"? yes (matched "test.ex")
+ test.ex in domains? yes (matched "test.ex")
 checking local_parts
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -424,10 +426,10 @@ checking local_parts
  file lookup required for test.ex
    in TESTSUITE/aux-fixed/0085.data
  creating new cache entry
- lookup yielded: x : y : abc@d.e.f
-x in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+x in local_parts?
  list element: x
- x in "x : y : abc@d.e.f"? yes (matched "x")
+ x in local_parts? yes (matched "x")
 checking senders
  search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
    cached open
@@ -440,8 +442,8 @@ checking senders
    type=lsearch key="test.ex" opts=NULL
  cached data used for lookup of test.ex
    in TESTSUITE/aux-fixed/0085.data
- lookup yielded: x : y : abc@d.e.f
-CALLER@myhost.test.ex in "x : y : abc@d.e.f"?
+ lookup yielded: x░:░y░:░abc@d.e.f
+CALLER@myhost.test.ex in senders?
  list element: x
  address match test: subject=CALLER@myhost.test.ex pattern=x
  myhost.test.ex in "x"?
@@ -454,7 +456,7 @@ CALLER@myhost.test.ex in "x : y : abc@d.e.f"?
  myhost.test.ex in "y"? no (end of list)
  list element: abc@d.e.f
  address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
-CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
+CALLER@myhost.test.ex in senders? no (end of list)
 smart2 router skipped: senders mismatch
 no more routers
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -466,15 +468,15 @@ routing x@myhost.test.ex
 --------> smart1 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-myhost.test.ex in "smart.domain"?
+myhost.test.ex in domains?
  list element: smart.domain
-myhost.test.ex in "smart.domain"? no (end of list)
+myhost.test.ex in domains? no (end of list)
 smart1 router skipped: domains mismatch
 --------> fail_remote_domains router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-myhost.test.ex in "! +local_domains"?
- list element: ! +local_domains
+myhost.test.ex in domains?
+ list element: !░+local_domains
   start sublist local_domains
    myhost.test.ex in "test.ex : myhost.test.ex"?
    ╎list element: test.ex
@@ -482,14 +484,14 @@ myhost.test.ex in "! +local_domains"?
    ╎myhost.test.ex in "test.ex : myhost.test.ex"? yes (matched "myhost.test.ex")
   end sublist local_domains
  data from lookup saved for cache for +local_domains: key 'myhost.test.ex' value 'myhost.test.ex'
- myhost.test.ex in "! +local_domains"? no (matched "! +local_domains")
+ myhost.test.ex in domains? no (matched "! +local_domains")
 fail_remote_domains router skipped: domains mismatch
 --------> smart2 router <--------
 local_part=x domain=myhost.test.ex
 checking domains
-myhost.test.ex in "test.ex"?
+myhost.test.ex in domains?
  list element: test.ex
-myhost.test.ex in "test.ex"? no (end of list)
+myhost.test.ex in domains? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called