Merge branch 'patch-3' of https://github.com/bes-internal/exim into master_dmarc_doc

[exim.git] / test / stderr / 0362

diff --git a/test/stderr/0362 b/test/stderr/0362
index 60c6b653adeec0bbd20aa7ed70f4618a2d3487e0..14065094fb4f93718ec3be9da86fd483cca783a2 100644 (file)
--- a/test/stderr/0362
+++ b/test/stderr/0362
@@ -32,7 +32,7 @@ processing "accept"
 check domains = +local_domains
 a.b.c in "*.test.ex"? no (end of list)
 a.b.c in "+local_domains"? no (end of list)
 check domains = +local_domains
 a.b.c in "*.test.ex"? no (end of list)
 a.b.c in "+local_domains"? no (end of list)

-accept: condition test failed
+accept: condition test failed in ACL "check_rcpt"

 processing "accept"
 check domains = +relay_domains
 a.b.c in "a.b.c"? yes (matched "a.b.c")
 processing "accept"
 check domains = +relay_domains
 a.b.c in "a.b.c"? yes (matched "a.b.c")


@@ -40,7 +40,7 @@ a.b.c in "+relay_domains"? yes (matched "+relay_domains")
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@a.b.c
 check verify = recipient
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@a.b.c

-address match: subject=x@a.b.c pattern=x@a.b.c
+address match test: subject=x@a.b.c pattern=x@a.b.c

 a.b.c in "a.b.c"? yes (matched "a.b.c")
 x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN
 a.b.c in "a.b.c"? yes (matched "a.b.c")
 x@a.b.c in "x@a.b.c"? yes (matched "x@a.b.c")
 LOG: address_rewrite MAIN


@@ -72,7 +72,7 @@ routed by r2 router
   envelope to: x@x.test.ex
   transport: t2
 ----------- end verify ------------
   envelope to: x@x.test.ex
   transport: t2
 ----------- end verify ------------

-accept: condition test succeeded
+accept: condition test succeeded in ACL "check_rcpt"

 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection