Taint: reject or log more tainted list metadata elements

[exim.git] / test / stderr / 0362

diff --git a/test/stderr/0362 b/test/stderr/0362
index 868422d5352c1889100a8b46b1950097178fa7a1..132df8c8e4d6202c9431c8d4a643af8cb6525dad 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -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
@@ -39,7 +40,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@a.b.c>
 using ACL "check_rcpt"
-processing "accept" (TESTSUITE/test-config 22)
+processing ACL check_rcpt "accept" (TESTSUITE/test-config 22)
 check domains = +local_domains
 a.b.c in "+local_domains"?
  list element: +local_domains
@@ -49,8 +50,8 @@ a.b.c in "+local_domains"?
    a.b.c in "*.test.ex"? no (end of list)
   end sublist local_domains
 a.b.c in "+local_domains"? no (end of list)
-accept: condition test failed in ACL "check_rcpt"
-processing "accept" (TESTSUITE/test-config 23)
+accept: condition test failed in ACL check_rcpt
+processing ACL check_rcpt "accept" (TESTSUITE/test-config 23)
 check domains = +relay_domains
 a.b.c in "+relay_domains"?
  list element: +relay_domains
@@ -80,19 +81,19 @@ routing x@x.test.ex
 --------> r1 router <--------
 local_part=x domain=x.test.ex
 checking domains
-x.test.ex in "+relay_domains"?
+x.test.ex in domains?
  list element: +relay_domains
   start sublist relay_domains
    x.test.ex in "a.b.c"?
    ╎list element: a.b.c
    x.test.ex in "a.b.c"? no (end of list)
   end sublist relay_domains
-x.test.ex in "+relay_domains"? no (end of list)
+x.test.ex in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=x domain=x.test.ex
 checking domains
-x.test.ex in "+local_domains"?
+x.test.ex in domains?
  list element: +local_domains
   start sublist local_domains
    x.test.ex in "*.test.ex"?
@@ -100,7 +101,7 @@ x.test.ex in "+local_domains"?
    ╎x.test.ex in "*.test.ex"? yes (matched "*.test.ex")
   end sublist local_domains
  data from lookup saved for cache for +local_domains: key 'x.test.ex' value '*.test.ex'
- x.test.ex in "+local_domains"? yes (matched "+local_domains")
+ x.test.ex in domains? yes (matched "+local_domains")
 calling r2 router
 r2 router called for x@x.test.ex
   domain = x.test.ex
@@ -113,12 +114,12 @@ routed by r2 router
   envelope to: x@x.test.ex
   transport: t2
 ----------- end verify ------------
-accept: condition test succeeded in ACL "check_rcpt"
-end of ACL "check_rcpt": ACCEPT
+accept: condition test succeeded in ACL check_rcpt
+end of ACL check_rcpt: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from (test) [V4NET.0.0.0] closed by QUIT
+  SMTP connection from (test) [V4NET.0.0.0] D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>