Fix include_directory in redirect routers. Bug 2715

[exim.git] / test / stderr / 0306

diff --git a/test/stderr/0306 b/test/stderr/0306
index d2fcf91e5a01b5561e4f592c6aefbfa359fb63f1..ff95f973865f528ae81eda2d6c078d8997de8013 100644 (file)
--- a/test/stderr/0306
+++ b/test/stderr/0306
@@ -6,8 +6,9 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)

+>>> test in helo_lookup_domains? no (end of list)

 >>> using ACL "rcpt"
 >>> using ACL "rcpt"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1-request@lists.test.ex
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1-request@lists.test.ex


@@ -26,7 +27,7 @@
 >>> accept: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": ACCEPT
 >>> using ACL "rcpt"
 >>> accept: condition test succeeded in ACL "rcpt"
 >>> end of ACL "rcpt": ACCEPT
 >>> using ACL "rcpt"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex


@@ -39,7 +40,7 @@
 >>> end of ACL "rcpt": ACCEPT
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "rcpt"
 >>> end of ACL "rcpt": ACCEPT
 >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 >>> using ACL "rcpt"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing list1@lists.test.ex


@@ -51,9 +52,9 @@
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "rcpt"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> 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
+LOG: H=(test) [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"
 >>> using ACL "rcpt"

->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 18)

 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing nonlist@lists.test.ex
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing nonlist@lists.test.ex


@@ -68,4 +69,4 @@ LOG: H=[1.2.3.4] F=<anyone@anywhere> rejected RCPT <list1@lists.test.ex>: list1@
 >>> ----------- end verify ------------
 >>> accept: condition test failed in ACL "rcpt"
 >>> accept: endpass encountered - denying access
 >>> ----------- end verify ------------
 >>> 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
+LOG: H=(test) [1.2.3.4] F=<anyone@anywhere> rejected RCPT <nonlist@lists.test.ex>: nonlist@lists.test.ex is a closed mailing list