Fix taint hybrid-checking on BSD

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

diff --git a/test/stderr/3201 b/test/stderr/3201
index 47318b3ae520f6381956e0701228769092c791bd..333afbc1f11af6bbff8b2a4f966524485fae8caf 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -21,7 +21,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"
 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"
 check hosts = testdb;fail
 search_open: testdb "NULL"
 search_find: file="NULL"


@@ -33,13 +33,13 @@ database lookup required for fail
 testdb lookup forced FAIL
 lookup failed
 host in "testdb;fail"? no (end of list)
 testdb lookup forced FAIL
 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
 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
   H=[10.0.0.1] rejected connection in "connect" ACL
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp


@@ -63,7 +63,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"
 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"
 check hosts = net-testdb;fail
 search_open: testdb "NULL"
 search_find: file="NULL"


@@ -75,10 +75,10 @@ database lookup required for fail
 testdb lookup forced FAIL
 lookup failed
 host in "net-testdb;fail"? no (end of list)
 testdb lookup forced FAIL
 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
 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
   H=[10.0.0.2] rejected connection in "connect" ACL
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>