Merge branch 'master' into 4.next

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index d2c77446641a5a8179784e00b127e0cf68069efc..aa91bff38a4efe8cf862f1305619ca5c1d19cd22 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -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
@@ -32,14 +33,14 @@ domain1 in "+special_domains"?
    ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
    ╎  key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL
    ╎LRU list:
-   ╎  <TESTSUITE/aux-fixed/0464.domains
+   ╎  0TESTSUITE/aux-fixed/0464.domains
    ╎  End
    ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
    ╎  type=lsearch key="domain1" opts=NULL
    ╎file lookup required for domain1
    ╎  in TESTSUITE/aux-fixed/0464.domains
    ╎creating new cache entry
-   ╎lookup yielded: data for domain1
+   ╎lookup yielded: data░for░domain1
    ╎domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? yes (matched "lsearch;TESTSUITE/aux-fixed/0464.domains")
   end sublist special_domains
  data from lookup saved for cache for +special_domains: key 'domain1' value 'data for domain1'
@@ -54,12 +55,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-domain1 in "+special_domains"?
+domain1 in domains?
  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1
- domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+ domain1 in domains? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -79,7 +80,7 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-xxx.domain1 in "+special_domains"?
+xxx.domain1 in domains?
  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
@@ -89,7 +90,7 @@ xxx.domain1 in "+special_domains"?
    ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
    ╎  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
    ╎LRU list:
-   ╎  <TESTSUITE/aux-fixed/0464.domains
+   ╎  0TESTSUITE/aux-fixed/0464.domains
    ╎  End
    ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
    ╎  type=lsearch key="xxx.domain1" opts=NULL
@@ -99,7 +100,7 @@ xxx.domain1 in "+special_domains"?
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains
-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
@@ -134,12 +135,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-domain1 in "+special_domains"?
+domain1 in domains?
  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1
- domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+ domain1 in domains? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -159,7 +160,7 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-xxx.domain1 in "+special_domains"?
+xxx.domain1 in domains?
  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
@@ -169,7 +170,7 @@ xxx.domain1 in "+special_domains"?
    ╎search_find: file="TESTSUITE/aux-fixed/0464.domains"
    ╎  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
    ╎LRU list:
-   ╎  <TESTSUITE/aux-fixed/0464.domains
+   ╎  0TESTSUITE/aux-fixed/0464.domains
    ╎  End
    ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
    ╎  type=lsearch key="xxx.domain1" opts=NULL
@@ -178,7 +179,7 @@ xxx.domain1 in "+special_domains"?
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains
-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
@@ -201,6 +202,6 @@ SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>