Callouts: fix recipient verify/random

[exim.git] / test / stderr / 0306

diff --git a/test/stderr/0306 b/test/stderr/0306
index 647a4c809f31896ee7ce4cd4503f08a23a574b83..d2fcf91e5a01b5561e4f592c6aefbfa359fb63f1 100644 (file)
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -23,7 +23,8 @@
 >>> calling r5 router
 >>> routed by r5 router
 >>> ----------- end verify ------------
 >>> calling r5 router
 >>> routed by r5 router
 >>> ----------- end verify ------------

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "rcpt"
+>>> end of ACL "rcpt": ACCEPT

 >>> using ACL "rcpt"
 >>> processing "accept"
 >>> check verify = recipient
 >>> using ACL "rcpt"
 >>> processing "accept"
 >>> check verify = recipient


@@ -34,7 +35,8 @@
 >>> calling r2 router
 >>> routed by r2 router
 >>> ----------- end verify ------------
 >>> calling r2 router
 >>> routed by r2 router
 >>> ----------- end verify ------------

->>> accept: condition test succeeded
+>>> accept: condition test succeeded in ACL "rcpt"
+>>> end of ACL "rcpt": ACCEPT

 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "accept"
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> processing "accept"


@@ -47,7 +49,7 @@
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "rcpt"

 >>> accept: endpass encountered - denying access
 LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@lists.test.ex is a closed mailing list
 >>> using ACL "rcpt"
 >>> accept: endpass encountered - denying access
 LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@lists.test.ex is a closed mailing list
 >>> using ACL "rcpt"


@@ -64,6 +66,6 @@ LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------
 >>> calling r3 router
 >>> r3 router forced address failure
 >>> ----------- end verify ------------

->>> accept: condition test failed
+>>> accept: condition test failed in ACL "rcpt"

 >>> accept: endpass encountered - denying access
 LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list
 >>> accept: endpass encountered - denying access
 LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list