X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ddf1b11a732e293cd242c80bc63d459dda595bf4..c71f869820b45b911cc8edbd0de88bbc9621fd5f:/test/stderr/0294 diff --git a/test/stderr/0294 b/test/stderr/0294 index 590191625..2ec78fb58 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -8,53 +8,50 @@ 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_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test SMTP<< mail from: spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0 -log directory space = -1K inodes = -1 check_space = 10240K inodes = 100 +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: >>Headers after rewriting and local additions: -I Message-Id: -F From: x@y - Date: Tue, 2 Mar 1999 09:44:33 +0000 + 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 +Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D +Data file written for message 10HmaX-000000005vi-0000 >>Generated Received: header line -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + 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: TESTSUITE/spool//input//hdr.pppp -Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H + id 10HmaX-000000005vi-0000; + Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-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-000000005vi-0000 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 1 sec @@ -63,31 +60,30 @@ 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: >>Headers after rewriting and local additions: -I Message-Id: -F From: x@y - Date: Tue, 2 Mar 1999 09:44:33 +0000 + 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 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line -P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) +P Received: from CALLER (helo=test) + 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: TESTSUITE/spool//input//hdr.pppp -Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H + id 10HmaY-000000005vi-0000 + for two@z; + Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-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-000000005vi-0000 smtp_setup_msg entered SMTP<< mail from: rate limit MAIL: delay 2 sec @@ -97,8 +93,8 @@ 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 >>>>>>>>>>>>>>>> + SMTP connection from CALLER D=qqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -117,36 +113,47 @@ 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_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? + list element: @ + list element: @[] +test in helo_lookup_domains? no (end of list) +SMTP>> 250 myhost.test.ex Hello test [1.2.3.4] 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"? + list element: reject one in "reject"? no (end of list) deny: condition test failed in inline ACL -processing "accept" +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? + list element: + list element: V4NET.9.8.7 host in smtp_ratelimit_hosts? no (end of list) -processing "deny" +processing "deny" (TESTSUITE/test-config 35) check local_parts = reject +one in "reject"? + list element: reject one in "reject"? no (end of list) deny: condition test failed in inline ACL -processing "accept" +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 >>>>>>>>>>>>>>>> + SMTP connection from (test) [1.2.3.4] D=qqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -165,37 +172,48 @@ 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_setup_msg entered +SMTP<< helo test +test in helo_lookup_domains? + list element: @ + list element: @[] +test in helo_lookup_domains? no (end of list) +SMTP>> 250 myhost.test.ex Hello test [V4NET.9.8.7] 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"? + list element: reject one in "reject"? no (end of list) deny: condition test failed in inline ACL -processing "accept" +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") +host in smtp_ratelimit_hosts? + list element: + list element: V4NET.9.8.7 + 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"? + list element: reject one in "reject"? no (end of list) deny: condition test failed in inline ACL -processing "accept" +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 >>>>>>>>>>>>>>>> + SMTP connection from (test) [V4NET.9.8.7] D=qqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -206,6 +224,8 @@ 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_setup_msg entered +SMTP<< helo test +SMTP>> 250 myhost.test.ex Hello CALLER at test 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 @@ -255,5 +275,5 @@ 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 >>>>>>>>>>>>>>>> + SMTP connection from CALLER D=qqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>