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 f18276074efbf5c22edb909171900a3847df4daa..8160fe0eb3974f5bb3be8e98e0c376e3fef28ba2 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -1,4 +1,5 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
 configuration file is TESTSUITE/test-config
@@ -21,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
@@ -39,7 +40,7 @@ domain1 in "+special_domains"?
    ╎file lookup required for domain1
    ╎  in TESTSUITE/aux-fixed/0464.domains
    ╎creating new cache entry
-   ╎lookup yielded: data for domain1
+   ╎lookup yielded: data░for░domain1
    ╎domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? yes (matched "lsearch;TESTSUITE/aux-fixed/0464.domains")
   end sublist special_domains
  data from lookup saved for cache for +special_domains: key 'domain1' value 'data for domain1'
@@ -54,12 +55,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-domain1 in "+special_domains"?
+domain1 in domains?
  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1
- domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+ domain1 in domains? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -70,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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -79,7 +80,7 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-xxx.domain1 in "+special_domains"?
+xxx.domain1 in domains?
  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
@@ -99,7 +100,7 @@ xxx.domain1 in "+special_domains"?
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains
-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
@@ -112,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
@@ -134,12 +135,12 @@ routing abc@domain1
 --------> r1 router <--------
 local_part=abc domain=domain1
 checking domains
-domain1 in "+special_domains"?
+domain1 in domains?
  list element: +special_domains
   start sublist special_domains
  cached yes match for +special_domains
  cached lookup data = data for domain1
- domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
+ domain1 in domains? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
 expanded: 'abc@xxx.domain1' (tainted)
@@ -150,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
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -159,7 +160,7 @@ routing abc@xxx.domain1
 --------> r1 router <--------
 local_part=abc domain=xxx.domain1
 checking domains
-xxx.domain1 in "+special_domains"?
+xxx.domain1 in domains?
  list element: +special_domains
   start sublist special_domains
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"?
@@ -178,7 +179,7 @@ xxx.domain1 in "+special_domains"?
    ╎lookup failed
    xxx.domain1 in "lsearch;TESTSUITE/aux-fixed/0464.domains"? no (end of list)
   end sublist special_domains
-xxx.domain1 in "+special_domains"? no (end of list)
+xxx.domain1 in domains? no (end of list)
 r1 router skipped: domains mismatch
 --------> r2 router <--------
 local_part=abc domain=xxx.domain1
@@ -190,17 +191,17 @@ 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
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>