Taint: reject or log more tainted list metadata elements

[exim.git] / test / stderr / 3201

diff --git a/test/stderr/3201 b/test/stderr/3201
index 0dd94ca5412ca099e86ddf12b965888d225c0846..417c67fe17c60e9752eee79ad112a38e8bc68362 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -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
@@ -21,27 +22,30 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect1"
-processing "deny" (TESTSUITE/test-config 18)
+processing ACL connect1 "deny" (TESTSUITE/test-config 18)
 check hosts = testdb;fail
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  type=testdb key="fail" opts=NULL
-database lookup required for fail
-testdb lookup forced FAIL
-creating new cache entry
-lookup failed
+host in "testdb;fail"?
+ list element: testdb;fail
+ search_open: testdb "NULL"
+ search_find: file="NULL"
+   key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=testdb key="fail" opts=NULL
+ database lookup required for fail
+ testdb lookup forced FAIL
+ creating new cache entry
+ lookup failed
 host in "testdb;fail"? no (end of list)
-deny: condition test failed in ACL "connect1"
-end of ACL "connect1": implicit DENY
+deny: condition test failed in ACL connect1
+end of ACL connect1: implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=[10.0.0.1] rejected connection in "connect" ACL
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 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
@@ -64,21 +68,23 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect2"
-processing "deny" (TESTSUITE/test-config 21)
+processing ACL connect2 "deny" (TESTSUITE/test-config 21)
 check hosts = net-testdb;fail
-search_open: testdb "NULL"
-search_find: file="NULL"
-  key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
-LRU list:
-internal_search_find: file="NULL"
-  type=testdb key="fail" opts=NULL
-database lookup required for fail
-testdb lookup forced FAIL
-creating new cache entry
-lookup failed
+host in "net-testdb;fail"?
+ list element: net-testdb;fail
+ search_open: testdb "NULL"
+ search_find: file="NULL"
+   key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
+ LRU list:
+ internal_search_find: file="NULL"
+   type=testdb key="fail" opts=NULL
+ database lookup required for fail
+ testdb lookup forced FAIL
+ creating new cache entry
+ lookup failed
 host in "net-testdb;fail"? no (end of list)
-deny: condition test failed in ACL "connect2"
-end of ACL "connect2": implicit DENY
+deny: condition test failed in ACL connect2
+end of ACL connect2: implicit DENY
 SMTP>> 550 Administrative prohibition
 LOG: connection_reject MAIN REJECT
   H=[10.0.0.2] rejected connection in "connect" ACL