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

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index aa91bff38a4efe8cf862f1305619ca5c1d19cd22..8160fe0eb3974f5bb3be8e98e0c376e3fef28ba2 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -22,7 +22,7 @@ log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
-processing "require" (TESTSUITE/test-config 20)
+processing ACL rcpt "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
 domain1 in "+special_domains"?
  list element: +special_domains
@@ -71,8 +71,8 @@ r1 router generated abc@xxx.domain1
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: abc@domain1
-  transport: <none>
+  envelope to: abc@domain1
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering abc@xxx.domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -113,11 +113,11 @@ domain = xxx.domain1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: abc@xxx.domain1
-  transport: smtp
+  envelope to: abc@xxx.domain1
+  transport:   smtp
 ----------- end verify ------------
-require: condition test succeeded in ACL "rcpt"
-processing "require" (TESTSUITE/test-config 23)
+require: condition test succeeded in ACL rcpt
+processing ACL rcpt "require" (TESTSUITE/test-config 23)
 check domains = +special_domains
 domain1 in "+special_domains"?
  list element: +special_domains
@@ -151,8 +151,8 @@ r1 router generated abc@xxx.domain1
   errors_to=NULL transport=NULL
   uid=unset gid=unset home=NULL
 routed by r1 router
-  envelope to: abc@domain1
-  transport: <none>
+  envelope to: abc@domain1
+  transport:   <none>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering abc@xxx.domain1
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -191,13 +191,13 @@ domain = xxx.domain1
   errors_to=NULL
   domain_data=NULL local_part_data=NULL
 routed by r2 router
-  envelope to: abc@xxx.domain1
-  transport: smtp
+  envelope to: abc@xxx.domain1
+  transport:   smtp
 ----------- end verify ------------
-require: condition test succeeded in ACL "rcpt"
-processing "accept" (TESTSUITE/test-config 25)
-accept: condition test succeeded in ACL "rcpt"
-end of ACL "rcpt": ACCEPT
+require: condition test succeeded in ACL rcpt
+processing ACL rcpt "accept" (TESTSUITE/test-config 25)
+accept: condition test succeeded in ACL rcpt
+end of ACL rcpt: ACCEPT
 SMTP>> 250 Accepted
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection