Testsuite: handle RC tagging convention

[exim.git] / test / stderr / 0464

diff --git a/test/stderr/0464 b/test/stderr/0464
index 06235fe9ff030b670713d2907dd385ffe5362985..cc39a583218ec8280ece11e6f3f3d79984be4d96 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -14,19 +14,21 @@ LOG: smtp_connection MAIN
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< mail from:<>
+spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
+log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain1>
 using ACL "rcpt"
-processing "require"
+processing "require" (TESTSUITE/test-config 20)
 check domains = +special_domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  key="domain1" partial=-1 affix=NULL starflags=0
+  key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
   0TESTSUITE/aux-fixed/0464.domains
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  type=lsearch key="domain1"
+  type=lsearch key="domain1" opts=NULL
 file lookup required for domain1
   in TESTSUITE/aux-fixed/0464.domains
 lookup yielded: data for domain1
@@ -47,8 +49,8 @@ cached yes match for +special_domains
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
-rda_interpret (string): $local_part@xxx.$domain
-expanded: abc@xxx.domain1
+rda_interpret (string): '$local_part@xxx.$domain'
+expanded: 'abc@xxx.domain1' (tainted)
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
@@ -68,12 +70,12 @@ checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  key="xxx.domain1" partial=-1 affix=NULL starflags=0
+  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
   0TESTSUITE/aux-fixed/0464.domains
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  type=lsearch key="xxx.domain1"
+  type=lsearch key="xxx.domain1" opts=NULL
 file lookup required for xxx.domain1
   in TESTSUITE/aux-fixed/0464.domains
 lookup failed
@@ -94,8 +96,8 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
-require: condition test succeeded
-processing "require"
+require: condition test succeeded in ACL "rcpt"
+processing "require" (TESTSUITE/test-config 23)
 check domains = +special_domains
 cached yes match for +special_domains
 cached lookup data = data for domain1
@@ -114,8 +116,8 @@ cached yes match for +special_domains
 cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
-rda_interpret (string): $local_part@xxx.$domain
-expanded: abc@xxx.domain1
+rda_interpret (string): '$local_part@xxx.$domain'
+expanded: 'abc@xxx.domain1' (tainted)
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
@@ -135,12 +137,12 @@ checking domains
 search_open: lsearch "TESTSUITE/aux-fixed/0464.domains"
   cached open
 search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  key="xxx.domain1" partial=-1 affix=NULL starflags=0
+  key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL
 LRU list:
   0TESTSUITE/aux-fixed/0464.domains
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0464.domains"
-  type=lsearch key="xxx.domain1"
+  type=lsearch key="xxx.domain1" opts=NULL
 cached data used for lookup of xxx.domain1
   in TESTSUITE/aux-fixed/0464.domains
 lookup failed
@@ -160,13 +162,15 @@ routed by r2 router
   envelope to: abc@xxx.domain1
   transport: smtp
 ----------- end verify ------------
-require: condition test succeeded
-processing "accept"
-accept: condition test succeeded
+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
 SMTP>> 250 Accepted
+DSN: orcpt: NULL  flags: 0
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>