tidying

[users/heiko/exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index df1a378c8410092c79826cd0399a499d925d792b..bc5b28b621b255f8578ce789921e2777bf6a4c44 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -21,7 +21,7 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 23)
 check set acl_c0 = $acl_c0; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
@@ -35,15 +35,20 @@ something in helo_lookup_domains? no (end of list)
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
+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-mail.test.ex Hello something [V4NET.0.0.0]
 250-SIZE 52428800
 250-8BITMIME
+250-VRFY
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>
+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
 using ACL "mail"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 27)
 check set acl_c0 = $acl_c0; mail
                  = ; connect; mail
 check set acl_c9 = $acl_c9; mail
@@ -55,7 +60,7 @@ end of ACL "mail": ACCEPT
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 32)
 check set acl_m0 = $acl_m0; rcpt
                  = ; mail; rcpt
 check set acl_m9 = $acl_m9; rcpt
@@ -65,6 +70,7 @@ check set acl_c0 = $acl_c0; rcpt
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": 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
@@ -73,6 +79,7 @@ search_tidyup called
 search_tidyup called
 >>Headers after rewriting and local additions:
 
+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from [V4NET.0.0.0] (helo=something)
@@ -81,15 +88,13 @@ P Received: from [V4NET.0.0.0] (helo=something)
        id 10HmaX-0005vi-00
        for x@y; Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "data"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 37)
 check set acl_m0 = $acl_m0; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data
 accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT
-calling local_scan(); timeout=300
-local_scan() returned 0 NULL
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
@@ -97,7 +102,7 @@ smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 using ACL "vrfy"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 41)
 check set acl_c0 = $acl_c0; vrfy
                  = ; connect; mail; rcpt; vrfy
 check set acl_c9 = $acl_c9; vrfy
@@ -117,8 +122,10 @@ LOG: MAIN
   VRFY failed for x@y H=(something) [V4NET.0.0.0]
 SMTP>> 550 <x@y> Unrouteable address
 SMTP<< mail from:<x@y>
+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
 using ACL "mail"
-processing "accept"
+processing "accept" (TESTSUITE/test-config 27)
 check set acl_c0 = $acl_c0; mail
                  = ; connect; mail; rcpt; vrfy; mail
 check set acl_c9 = $acl_c9; mail
@@ -133,4 +140,4 @@ SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>