X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b3f43fa01b5b8511bf22ff4781e6194cf2a5ab54..fa7b17bdbc8c055c475a50791627cd75d257f4f3:/test/stderr/0294?ds=sidebyside diff --git a/test/stderr/0294 b/test/stderr/0294 index 184cf9f41..55f747487 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -9,21 +9,28 @@ 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: SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: rate limit RCPT: delay 0.25 sec SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: rate limit RCPT: delay 0.263 sec SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: rate limit RCPT: delay 0.276 sec SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: rate limit RCPT: delay 0.289 sec SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: @@ -33,14 +40,14 @@ I Message-Id: F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 +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 CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss @@ -49,9 +56,12 @@ SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 1 sec +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: SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< data SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: @@ -61,15 +71,15 @@ I Message-Id: F From: x@y Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for two@z; Tue, 2 Mar 1999 09:44:33 +0000 -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-smtp S=sss @@ -77,12 +87,14 @@ SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 2 sec +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<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -102,29 +114,35 @@ host in helo_accept_junk_hosts? no (option unset) 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: -processing "deny" +processing "deny" (TESTSUITE/test-config 35) check local_parts = reject one in "reject"? no (end of list) -deny: condition test failed -processing "accept" -accept: condition test succeeded +deny: condition test failed in inline ACL +processing "accept" (TESTSUITE/test-config 35) +accept: condition test succeeded in inline ACL +end of inline ACL: ACCEPT SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: host in smtp_ratelimit_hosts? no (end of list) -processing "deny" +processing "deny" (TESTSUITE/test-config 35) check local_parts = reject one in "reject"? no (end of list) -deny: condition test failed -processing "accept" -accept: condition test succeeded +deny: condition test failed in inline ACL +processing "accept" (TESTSUITE/test-config 35) +accept: condition test succeeded in inline ACL +end of inline ACL: 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 [1.2.3.4] closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -144,30 +162,36 @@ host in helo_accept_junk_hosts? no (option unset) 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: -processing "deny" +processing "deny" (TESTSUITE/test-config 35) check local_parts = reject one in "reject"? no (end of list) -deny: condition test failed -processing "accept" -accept: condition test succeeded +deny: condition test failed in inline ACL +processing "accept" (TESTSUITE/test-config 35) +accept: condition test succeeded in inline ACL +end of inline ACL: ACCEPT SMTP>> 250 Accepted +DSN: orcpt: NULL flags: 0 SMTP<< rcpt to: host in smtp_ratelimit_hosts? yes (matched "V4NET.9.8.7") rate limit RCPT: delay 0.25 sec -processing "deny" +processing "deny" (TESTSUITE/test-config 35) check local_parts = reject one in "reject"? no (end of list) -deny: condition test failed -processing "accept" -accept: condition test succeeded +deny: condition test failed in inline ACL +processing "accept" (TESTSUITE/test-config 35) +accept: condition test succeeded in inline ACL +end of inline ACL: 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 [V4NET.9.8.7] closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -179,6 +203,8 @@ 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: SMTP>> 550 Administrative prohibition @@ -208,6 +234,8 @@ SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from: rate limit MAIL: delay 1 sec +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: SMTP>> 550 Administrative prohibition @@ -217,9 +245,11 @@ SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from: rate limit MAIL: delay 2 sec +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<< quit SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>