X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/aa368db3cd1fe1040bfe90ec1673e9a7c798db9b..a355463cfc6479893c6212056a5ca7e6bf2d450b:/test/stderr/0303

diff --git a/test/stderr/0303 b/test/stderr/0303
index 598ed62ed..bf8f94662 100644
--- a/test/stderr/0303
+++ b/test/stderr/0303
@@ -72,23 +72,27 @@ host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello [V4NET.2.3.4] [V4NET.2.3.4]
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
+       250-SIZE 52428800
+       250-8BITMIME
+       250-PIPELINING
+       250 HELP
 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:<x@y>
-processing "accept"
+processing "accept" (TESTSUITE/test-config 12)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
@@ -98,9 +102,8 @@ Data file written for message 10HmaX-0005vi-00
 P Received: from [V4NET.2.3.4]
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaX-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=([V4NET.2.3.4]) [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
@@ -110,7 +113,7 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from ([V4NET.2.3.4]) [V4NET.2.3.4] closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -146,23 +149,27 @@ host in dsn_advertise_hosts? no (option unset)
 host in pipelining_advertise_hosts? yes (matched "*")
 host in chunking_advertise_hosts? no (end of list)
 SMTP>> 250-myhost.test.ex Hello host.name.tld [V4NET.2.3.4]
-250-SIZE 52428800
-250-8BITMIME
-250-PIPELINING
-250 HELP
+       250-SIZE 52428800
+       250-8BITMIME
+       250-PIPELINING
+       250 HELP
 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:<x@y>
-processing "accept"
+processing "accept" (TESTSUITE/test-config 12)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
 search_tidyup called
 >>Headers after rewriting and local additions:
 
@@ -172,9 +179,8 @@ Data file written for message 10HmaY-0005vi-00
 P Received: from host.name.tld ([V4NET.2.3.4])
 	by myhost.test.ex with esmtp (Exim x.yz)
 	id 10HmaY-0005vi-00
-	for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
+	for x@y;
+	Tue, 2 Mar 1999 09:44:33 +0000
 LOG: MAIN
   <= <> H=host.name.tld [V4NET.2.3.4] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaY-0005vi-00
@@ -184,4 +190,4 @@ SMTP>> 221 myhost.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from host.name.tld [V4NET.2.3.4] closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>