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 600ea629350420dab367b7cc63ab7a629db9a182..417c67fe17c60e9752eee79ad112a38e8bc68362 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -1,31 +1,7 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -46,7 +22,7 @@ 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
 host in "testdb;fail"?
  list element: testdb;fail
@@ -61,41 +37,17 @@ host in "testdb;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
-SHELL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-EXIM_TEST_NUMBER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PWD in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-TERM in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-USER in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-SHLVL in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
-_ in keep_environment?
- list element: PATH
- list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-PATH in keep_environment?
- list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -116,7 +68,7 @@ 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
 host in "net-testdb;fail"?
  list element: net-testdb;fail
@@ -131,8 +83,8 @@ host in "net-testdb;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