Log: more info in ACL "warn statement skipped" message. Bug 2897

[exim.git] / test / stderr / 0381

diff --git a/test/stderr/0381 b/test/stderr/0381
index d35fb626190ba7f4605240f4a697d6fd0bce26aa..f73b447ba92d445b0c80ac42f9343a49fc32e106 100644 (file)
--- a/test/stderr/0381
+++ b/test/stderr/0381
@@ -43,7 +43,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@test.ex>
 using ACL "check_rcpt"

-processing "warn" (TESTSUITE/test-config 17)
+processing ACL check_rcpt "warn" (TESTSUITE/test-config 17)

 check hosts = *.gov.uk.test.ex
 host in "*.gov.uk.test.ex"?
  list element: *.gov.uk.test.ex
 check hosts = *.gov.uk.test.ex
 host in "*.gov.uk.test.ex"?
  list element: *.gov.uk.test.ex


@@ -77,28 +77,28 @@ sender_fullhost = x.gov.uk.test.ex (test) [V4NET.99.99.97]
 sender_rcvhost = x.gov.uk.test.ex
        ([V4NET.99.99.97] helo=test ident=CALLER)
   host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")
 sender_rcvhost = x.gov.uk.test.ex
        ([V4NET.99.99.97] helo=test ident=CALLER)
   host in "*.gov.uk.test.ex"? yes (matched "*.gov.uk.test.ex")

-warn: condition test succeeded in ACL "check_rcpt"
-processing "warn" (TESTSUITE/test-config 18)
+warn: condition test succeeded in ACL check_rcpt
+processing ACL check_rcpt "warn" (TESTSUITE/test-config 18)

 check hosts = !*.gov.uk.test.ex
 host in "!*.gov.uk.test.ex"?
  list element: !*.gov.uk.test.ex
   host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")
 check hosts = !*.gov.uk.test.ex
 host in "!*.gov.uk.test.ex"?
  list element: !*.gov.uk.test.ex
   host in "!*.gov.uk.test.ex"? no (matched "!*.gov.uk.test.ex")

-warn: condition test failed in ACL "check_rcpt"
-processing "warn" (TESTSUITE/test-config 19)
+warn: condition test failed in ACL check_rcpt
+processing ACL check_rcpt "warn" (TESTSUITE/test-config 19)

 check hosts = *.co.uk.test.ex
 host in "*.co.uk.test.ex"?
  list element: *.co.uk.test.ex
   host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")
 check hosts = *.co.uk.test.ex
 host in "*.co.uk.test.ex"?
  list element: *.co.uk.test.ex
   host in "*.co.uk.test.ex"? yes (matched "*.co.uk.test.ex")

-warn: condition test succeeded in ACL "check_rcpt"
-processing "warn" (TESTSUITE/test-config 20)
+warn: condition test succeeded in ACL check_rcpt
+processing ACL check_rcpt "warn" (TESTSUITE/test-config 20)

 check hosts = !*.co.uk.test.ex
 host in "!*.co.uk.test.ex"?
  list element: !*.co.uk.test.ex
   host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")
 check hosts = !*.co.uk.test.ex
 host in "!*.co.uk.test.ex"?
  list element: !*.co.uk.test.ex
   host in "!*.co.uk.test.ex"? no (matched "!*.co.uk.test.ex")

-warn: condition test failed in ACL "check_rcpt"
-processing "accept" (TESTSUITE/test-config 21)
-accept: condition test succeeded in ACL "check_rcpt"
-end of ACL "check_rcpt": ACCEPT
+warn: condition test failed in ACL check_rcpt
+processing ACL check_rcpt "accept" (TESTSUITE/test-config 21)
+accept: condition test succeeded in ACL check_rcpt
+end of ACL check_rcpt: ACCEPT

 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection