Cutthrough: option to use transport-defined mailfrom. Bug 3071

[exim.git] / test / stderr / 0058

diff --git a/test/stderr/0058 b/test/stderr/0058
index 0901cccf284a86d5911e35df60a958537b66e495..61dc2c0ea4d44dbc2dcf933a2ec2ee4d46f8fd2a 100644 (file)
--- a/test/stderr/0058
+++ b/test/stderr/0058
@@ -11,7 +11,7 @@
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"
 >>>  list element: @[]
 >>> test in helo_lookup_domains? no (end of list)
 >>> using ACL "check_recipient"

->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 19)

 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains


@@ -22,8 +22,8 @@
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)

->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 20)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 20)

 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts


@@ -33,11 +33,11 @@
 >>>    ╎host in "*"? yes (matched "*")
 >>>   end sublist relay_hosts
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts")
 >>>    ╎host in "*"? yes (matched "*")
 >>>   end sublist relay_hosts
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts")

->>> accept: condition test succeeded in ACL "check_recipient"
->>> end of ACL "check_recipient": ACCEPT
+>>> 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
 >>> using ACL "check_recipient"
 LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
 >>> using ACL "check_recipient"

->>> processing "accept" (TESTSUITE/test-config 19)
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 19)

 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains
 >>> check domains = +local_domains
 >>> anotherhost.example.com in "+local_domains"?
 >>>  list element: +local_domains


@@ -48,8 +48,8 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)
 >>>    anotherhost.example.com in "test.ex : myhost.ex"? no (end of list)
 >>>   end sublist local_domains
 >>> anotherhost.example.com in "+local_domains"? no (end of list)

->>> accept: condition test failed in ACL "check_recipient"
->>> processing "accept" (TESTSUITE/test-config 20)
+>>> accept: condition test failed in ACL check_recipient
+>>> processing ACL check_recipient "accept" (TESTSUITE/test-config 20)

 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts
 >>> check hosts = +relay_hosts
 >>> host in "+relay_hosts"?
 >>>  list element: +relay_hosts


@@ -57,6 +57,6 @@ LOG: 10HmaX-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1
 >>>  cached yes match for +relay_hosts
 >>>  cached lookup data = NULL
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)
 >>>  cached yes match for +relay_hosts
 >>>  cached lookup data = NULL
 >>>  host in "+relay_hosts"? yes (matched "+relay_hosts" - cached)

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

 LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss
 LOG: 10HmaY-000000005vi-0000 <= userx@somehost.example.com H=(test) [V4NET.0.0.1] P=smtp S=sss