Sync 4.next from master

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

diff --git a/test/stderr/3201 b/test/stderr/3201
index 0c69a1218ca4eb656bde5dae1be0c5859b30e7a9..10fa6f937e93d00a6e10b663f32ac4053395ca38 100644 (file)
--- a/test/stderr/3201
+++ b/test/stderr/3201
@@ -33,10 +33,10 @@ database lookup required for fail
 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\r
-LOG: MAIN REJECT
+SMTP>> 550 Administrative prohibition
+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 >>>>>>>>>>>>>>>>
@@ -75,10 +75,10 @@ database lookup required for fail
 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\r
-LOG: MAIN REJECT
+SMTP>> 550 Administrative prohibition
+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 >>>>>>>>>>>>>>>>