Taint: fix ACL "spam" condition, to permit tainted name arguments.

[users/heiko/exim.git] / test / stderr / 3201

diff --git a/test/stderr/3201 b/test/stderr/3201
index 47318b3ae520f6381956e0701228769092c791bd..601a9ec851b3cdcd6fde4bb6cd4711ac11281d8a 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -21,25 +21,26 @@ 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"
+processing "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
+  key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=testdb key="fail"
+  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
+deny: condition test failed in ACL "connect1"
 end of ACL "connect1": implicit DENY
 SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+LOG: connection_reject MAIN REJECT
   H=[10.0.0.1] rejected connection in "connect" ACL
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -63,22 +64,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"
+processing "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
+  key="fail" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
 internal_search_find: file="NULL"
-  type=testdb key="fail"
+  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
+deny: condition test failed in ACL "connect2"
 end of ACL "connect2": implicit DENY
 SMTP>> 550 Administrative prohibition
-LOG: MAIN REJECT
+LOG: connection_reject MAIN REJECT
   H=[10.0.0.2] rejected connection in "connect" ACL
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>