X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/46a36afae41f63de654269c8a0b7cf5852a85a14..9bf74b9c298f6968417fe88a68ccdf2179db1403:/test/stderr/0022?ds=sidebyside

diff --git a/test/stderr/0022 b/test/stderr/0022
index 2eae4f906..b803208c5 100644
--- a/test/stderr/0022
+++ b/test/stderr/0022
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1236
 configuration file is TESTSUITE/test-config
@@ -54,8 +55,8 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
@@ -79,6 +80,7 @@ LOG: smtp_connection MAIN
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1237
 configuration file is TESTSUITE/test-config
@@ -137,8 +139,8 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
@@ -162,6 +164,7 @@ LOG: smtp_connection MAIN
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1238
 configuration file is TESTSUITE/test-config
@@ -218,8 +221,8 @@ search_tidyup called
 >>Headers received:
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
@@ -379,9 +382,12 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check@y>: host data >A h
 >>> check hosts = +some_hosts
 >>> host in "+some_hosts"?
 >>>  list element: +some_hosts
->>>  host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"?
->>>   list element: net-lsearch;TESTSUITE/aux-var/0022.hosts
->>>   host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
+>>>   start sublist some_hosts
+>>>    host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"?
+>>>    ╎list element: net-lsearch;TESTSUITE/aux-var/0022.hosts
+>>>    ╎host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts")
+>>>   end sublist some_hosts
+>>>  data from lookup saved for cache for +some_hosts: key 'V4NET.9.8.7' value 'A host-specific message'
 >>>  host in "+some_hosts"? yes (matched "+some_hosts")
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> end of ACL "host_check2": DENY
@@ -392,6 +398,9 @@ LOG: H=(test) [V4NET.9.8.7] F=<x@y> rejected RCPT <host_check2@y>: host data >A
 >>> check hosts = +some_hosts
 >>> host in "+some_hosts"?
 >>>  list element: +some_hosts
+>>>   start sublist some_hosts
+>>>  cached yes match for +some_hosts
+>>>  cached lookup data = A host-specific message
 >>>  host in "+some_hosts"? yes (matched "+some_hosts" - cached)
 >>> deny: condition test succeeded in ACL "host_check2"
 >>> end of ACL "host_check2": DENY