Propagate null gstring through string_catn()

[exim.git] / test / stderr / 0306

diff --git a/test/stderr/0306 b/test/stderr/0306
index 647a4c809f31896ee7ce4cd4503f08a23a574b83..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


@@ -23,9 +24,10 @@
 >>> 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"
 >>> 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


@@ -34,10 +36,11 @@
 >>> 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"
 >>> 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


@@ -47,11 +50,11 @@
 >>> 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
 >>> 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


@@ -64,6 +67,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
 >>> 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