X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/54c5ebb14ead7439af300e9d7d9d7d2ba29ff32e..a505cf777f90755bce69ab53a899b284a304127b:/test/stderr/0294?ds=sidebyside diff --git a/test/stderr/0294 b/test/stderr/0294 index 5afdb770a..cd0424eb8 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -6,26 +6,28 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +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 +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.25 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.263 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.276 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< rcpt to: rate limit RCPT: delay 0.289 sec -SMTP>> 250 Accepted +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: @@ -33,27 +35,29 @@ 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 created log directory TESTSUITE/spool/log -SMTP>> 250 OK id=10HmaX-0005vi-00 +SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 1 sec -SMTP>> 250 OK +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 +SMTP>> 250 Accepted SMTP<< data -SMTP>> 354 Enter message, ending with "." on a line by itself +SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: @@ -61,28 +65,30 @@ 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 -SMTP>> 250 OK id=10HmaY-0005vi-00 +SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 2 sec -SMTP>> 250 OK +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 +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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -99,32 +105,36 @@ host in recipient_unqualified_hosts? no (option unset) 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +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 -SMTP>> 250 Accepted +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 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 -SMTP>> 250 Accepted +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 SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -141,33 +151,37 @@ host in recipient_unqualified_hosts? no (option unset) 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) -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +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 -SMTP>> 250 Accepted +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 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 -SMTP>> 250 Accepted +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 SMTP<< quit -SMTP>> 221 myhost.test.ex closing connection +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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -176,50 +190,56 @@ originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = NULL LOG: smtp_connection MAIN SMTP connection from CALLER -SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from: -SMTP>> 250 OK +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 +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.25 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.263 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.276 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rcpt to: rate limit RCPT: delay 0.289 sec -SMTP>> 550 Administrative prohibition +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rset -SMTP>> 250 Reset OK +SMTP>> 250 Reset OK SMTP<< mail from: rate limit MAIL: delay 1 sec -SMTP>> 250 OK +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 +SMTP>> 550 Administrative prohibition LOG: MAIN REJECT U=CALLER F= rejected RCPT SMTP<< rset -SMTP>> 250 Reset OK +SMTP>> 250 Reset OK SMTP<< mail from: rate limit MAIL: delay 2 sec -SMTP>> 250 OK +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 +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 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>