Tidying: enum for smtp_write_mail_and_rcpt_cmds() retcodes

[exim.git] / test / stderr / 0056

diff --git a/test/stderr/0056 b/test/stderr/0056
index 54ae21faf5f84c5c92fcac8eab59a5b592e9962b..687b05ec9df69a875cc6f0fd99500782d8c14c01 100644 (file)
--- a/test/stderr/0056
+++ b/test/stderr/0056
@@ -6,32 +6,61 @@
 >>> 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?
+>>>  list element: @
+>>>  list element: @[]
+>>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
->>> test.ex in "+local_domains"? yes (matched "+local_domains")
->>> accept: condition test succeeded
+>>> test.ex in "+local_domains"?
+>>>  list element: +local_domains
+>>>  test.ex in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   test.ex in "test.ex : myhost.ex"? yes (matched "test.ex")
+>>>  test.ex in "+local_domains"? yes (matched "+local_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> otherhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> otherhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  otherhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  otherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> otherhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 21)
 >>> check domains = +relay_domains
->>> otherhost.example.com in "*"? yes (matched "*")
->>> otherhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
->>> accept: condition test succeeded
+>>> otherhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  otherhost.example.com in "*"?
+>>>   list element: *
+>>>   otherhost.example.com in "*"? yes (matched "*")
+>>>  otherhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
 >>> using ACL "check_recipient"
->>> processing "accept"
+>>> processing "accept" (TESTSUITE/test-config 20)
 >>> check domains = +local_domains
->>> 3rdhost.example.com in "test.ex : myhost.ex"? no (end of list)
+>>> 3rdhost.example.com in "+local_domains"?
+>>>  list element: +local_domains
+>>>  3rdhost.example.com in "test.ex : myhost.ex"?
+>>>   list element: test.ex
+>>>   list element: myhost.ex
+>>>  3rdhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>> 3rdhost.example.com in "+local_domains"? no (end of list)
->>> accept: condition test failed
->>> processing "accept"
+>>> accept: condition test failed in ACL "check_recipient"
+>>> processing "accept" (TESTSUITE/test-config 21)
 >>> check domains = +relay_domains
->>> 3rdhost.example.com in "*"? yes (matched "*")
->>> 3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
->>> accept: condition test succeeded
-LOG: 10HmaX-0005vi-00 <= userx@somehost.example.com H=[V4NET.0.0.1] P=smtp S=sss
+>>> 3rdhost.example.com in "+relay_domains"?
+>>>  list element: +relay_domains
+>>>  3rdhost.example.com in "*"?
+>>>   list element: *
+>>>   3rdhost.example.com in "*"? yes (matched "*")
+>>>  3rdhost.example.com in "+relay_domains"? yes (matched "+relay_domains")
+>>> accept: condition test succeeded in ACL "check_recipient"
+>>> end of ACL "check_recipient": ACCEPT
+LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss