Merge branch 'master' into transp_logging_1031

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

diff --git a/test/stderr/0381 b/test/stderr/0381
index bca2de5bfdf5701eb9a990f2966d42cac4ea963f..7f6f680dba1dc48d5ef8bd386639e03f6efa7a0f 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -13,6 +13,7 @@ sender address = NULL
 sender_fullhost = [V4NET.99.99.97]
 sender_rcvhost = [V4NET.99.99.97] (ident=CALLER)
 set_process_info: pppp handling incoming connection from [V4NET.99.99.97] via -oMa
+set_process_info: pppp accepting a local SMTP message from <CALLER>
 host in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
@@ -57,21 +58,21 @@ checking addresses for x.co.uk.test.ex
 sender_fullhost = x.gov.uk.test.ex [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex ([V4NET.99.99.97] ident=CALLER)
 host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
-warn: condition test succeeded
+warn: condition test succeeded in ACL "check_rcpt"
 processing "warn"
 check hosts = !*.gov.uk.test.ex
 host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
-warn: condition test failed
+warn: condition test failed in ACL "check_rcpt"
 processing "warn"
 check hosts = *.co.uk.test.ex
 host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
-warn: condition test succeeded
+warn: condition test succeeded in ACL "check_rcpt"
 processing "warn"
 check hosts = !*.co.uk.test.ex
 host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
-warn: condition test failed
+warn: condition test failed in ACL "check_rcpt"
 processing "accept"
-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_rcpt"
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection