Merge tag 'exim-4_82_1'

[exim.git] / test / stderr / 0479

diff --git a/test/stderr/0479 b/test/stderr/0479
index 187aaf6c8841d379e74ff9f430b2e437b708de21..92880ddb7b8f155ccad37802caaef4d6f070dca8 100644 (file)
--- a/test/stderr/0479
+++ b/test/stderr/0479
@@ -40,7 +40,7 @@ LOG: MAIN
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b
 check verify = sender
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying a@b

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

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


@@ -64,9 +64,9 @@ routed by r1 router
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b
   transport: t1
 ----------- end verify ------------
 sender a@b verified ok as rewritten-a@rewritten-b

-require: condition test succeeded
+require: condition test succeeded in ACL "rcpt"

 processing "accept"
 processing "accept"

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

 SMTP>> 250 Accepted
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"
 SMTP>> 250 Accepted
 SMTP<< rcpt to:<e@f>
 using ACL "rcpt"


@@ -77,9 +77,9 @@ LOG: MAIN
   sender address is <rewritten-a@rewritten-b>
 check verify = sender
 using cached sender verify result
   sender address is <rewritten-a@rewritten-b>
 check verify = sender
 using cached sender verify result

-require: condition test succeeded
+require: condition test succeeded in ACL "rcpt"

 processing "accept"
 processing "accept"

-accept: condition test succeeded
+accept: condition test succeeded in ACL "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