diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:23:26 +0100 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-11-25 11:25:08 +0100 |
| commit | 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 (patch) | |
| tree | 3f1ff4523e24671e5992008e6ac2d9f299942cfa /test/stderr | |
| parent | 7a28511635d0d5f385a7c389bc5ec95dfed95581 (diff) | |
Merge from master into 4.next
Done with git merge --squash -x theirs master
Diffstat (limited to 'test/stderr')
109 files changed, 2295 insertions, 1114 deletions
diff --git a/test/stderr/0002 b/test/stderr/0002 index b4f06a104..e7c70cfbf 100644 --- a/test/stderr/0002 +++ b/test/stderr/0002 @@ -1,120 +1,164 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -expanding: primary_hostname: $primary_hostname - result: primary_hostname: myhost.test.ex -expanding: abcd - result: abcd -expanding: \N^([ab]+)(\w+)$\N - result: ^([ab]+)(\w+)$ -condition: match{abcd}{\N^([ab]+)(\w+)$\N} - result: true -expanding: $2$1 - result: cdab -expanding: match: ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail} - result: match: cdab -expanding: wxyz - result: wxyz -expanding: \N^([ab]+)(\w+)$\N - result: ^([ab]+)(\w+)$ -condition: match{wxyz}{\N^([ab]+)(\w+)$\N} - result: false -expanding: $2$1 - result: -skipping: result is not used +considering: primary_hostname: $primary_hostname + expanding: primary_hostname: $primary_hostname + result: primary_hostname: myhost.test.ex +considering: match: ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail} +considering: abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail} + expanding: abcd + result: abcd +considering: \N^([ab]+)(\w+)$\N}{$2$1}fail} + expanding: \N^([ab]+)(\w+)$\N + result: ^([ab]+)(\w+)$ + condition: match{abcd}{\N^([ab]+)(\w+)$\N} + result: true +considering: $2$1}fail} + expanding: $2$1 + result: cdab + expanding: match: ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail} + result: match: cdab +considering: match: ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail} +considering: wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail} + expanding: wxyz + result: wxyz +considering: \N^([ab]+)(\w+)$\N}{$2$1}fail} + expanding: \N^([ab]+)(\w+)$\N + result: ^([ab]+)(\w+)$ + condition: match{wxyz}{\N^([ab]+)(\w+)$\N} + result: false + scanning: $2$1}fail} + expanding: $2$1 + result: + skipping: result is not used failed to expand: match: ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail} error message: "if" failed and "fail" requested failure was forced -expanding: 1 - result: 1 -expanding: 1 - result: 1 -condition: eq {1}{1} - result: true -expanding: yes - result: yes -expanding: xx - result: xx -skipping: result is not used -expanding: /non/exist - result: /non/exist -skipping: result is not used -expanding: ${lookup{xx}lsearch{/non/exist}} - result: -skipping: result is not used -expanding: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}} - result: yes -expanding: a.b.c - result: a.b.c -expanding: a.b.c - result: a.b.c +considering: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}} +considering: 1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}} + expanding: 1 + result: 1 +considering: 1}{yes}{${lookup{xx}lsearch{/non/exist}}}} + expanding: 1 + result: 1 + condition: eq {1}{1} + result: true +considering: yes}{${lookup{xx}lsearch{/non/exist}}}} + expanding: yes + result: yes + scanning: ${lookup{xx}lsearch{/non/exist}}}} + scanning: xx}lsearch{/non/exist}}}} + expanding: xx + result: xx + skipping: result is not used + scanning: /non/exist}}}} + expanding: /non/exist + result: /non/exist + skipping: result is not used + expanding: ${lookup{xx}lsearch{/non/exist}} + result: + skipping: result is not used + expanding: ${if eq {1}{1}{yes}{${lookup{xx}lsearch{/non/exist}}}} + result: yes +considering: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}} +considering: a.b.c}{a.b.c}{yes}{no}} + expanding: a.b.c + result: a.b.c +considering: a.b.c}{yes}{no}} + expanding: a.b.c + result: a.b.c LOG: MAIN PANIC no @ found in the subject of an address list match: subject="a.b.c" pattern="a.b.c" -condition: match_address{a.b.c}{a.b.c} - result: false -expanding: yes - result: yes -skipping: result is not used -expanding: no - result: no -expanding: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}} - result: match_address: no + condition: match_address{a.b.c}{a.b.c} + result: false + scanning: yes}{no}} + expanding: yes + result: yes + skipping: result is not used +considering: no}} + expanding: no + result: no + expanding: match_address: ${if match_address{a.b.c}{a.b.c}{yes}{no}} + result: match_address: no >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -expanding: -oMa sender_host_address = $sender_host_address - result: -oMa sender_host_address = V4NET.0.0.1 -expanding: sender_host_port = $sender_host_port - result: sender_host_port = 1234 -expanding: -oMaa sender_host_authenticated = $sender_host_authenticated - result: -oMaa sender_host_authenticated = AAA -expanding: -oMai authenticated_id = $authenticated_id - result: -oMai authenticated_id = philip -expanding: -oMas authenticated_sender = $authenticated_sender - result: -oMas authenticated_sender = xx@yy.zz -expanding: -oMi interface_address = $interface_address - result: -oMi interface_address = 1.1.1.1 -expanding: interface_port = $interface_port - result: interface_port = 99 -expanding: -oMr received_protocol = $received_protocol - result: -oMr received_protocol = special -expanding: -oMt sender_ident = $sender_ident - result: -oMt sender_ident = me +considering: -oMa sender_host_address = $sender_host_address + expanding: -oMa sender_host_address = $sender_host_address + result: -oMa sender_host_address = V4NET.0.0.1 +considering: sender_host_port = $sender_host_port + expanding: sender_host_port = $sender_host_port + result: sender_host_port = 1234 +considering: -oMaa sender_host_authenticated = $sender_host_authenticated + expanding: -oMaa sender_host_authenticated = $sender_host_authenticated + result: -oMaa sender_host_authenticated = AAA +considering: -oMai authenticated_id = $authenticated_id + expanding: -oMai authenticated_id = $authenticated_id + result: -oMai authenticated_id = philip +considering: -oMas authenticated_sender = $authenticated_sender + expanding: -oMas authenticated_sender = $authenticated_sender + result: -oMas authenticated_sender = xx@yy.zz +considering: -oMi interface_address = $interface_address + expanding: -oMi interface_address = $interface_address + result: -oMi interface_address = 1.1.1.1 +considering: interface_port = $interface_port + expanding: interface_port = $interface_port + result: interface_port = 99 +considering: -oMr received_protocol = $received_protocol + expanding: -oMr received_protocol = $received_protocol + result: -oMr received_protocol = special +considering: -oMt sender_ident = $sender_ident + expanding: -oMt sender_ident = $sender_ident + result: -oMt sender_ident = me >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 no host name found for IP address V4NET.11.12.13 Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -expanding: -oMa sender_host_address = $sender_host_address - result: -oMa sender_host_address = V4NET.0.0.1 -expanding: sender_host_port = $sender_host_port - result: sender_host_port = 1234 -expanding: -oMaa sender_host_authenticated = $sender_host_authenticated - result: -oMaa sender_host_authenticated = AAA -expanding: -oMai authenticated_id = $authenticated_id - result: -oMai authenticated_id = philip -expanding: -oMas authenticated_sender = $authenticated_sender - result: -oMas authenticated_sender = xx@yy.zz -expanding: -oMi interface_address = $interface_address - result: -oMi interface_address = 1.1.1.1 -expanding: interface_port = $interface_port - result: interface_port = 99 -expanding: -oMr received_protocol = $received_protocol - result: -oMr received_protocol = special -expanding: black - result: black -expanding: white - result: white -condition: eq{black}{white} - result: false -expanding: $sender_host_name - result: -skipping: result is not used -expanding: No - result: No -expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}} - result: ----> No lookup yet: No +considering: -oMa sender_host_address = $sender_host_address + expanding: -oMa sender_host_address = $sender_host_address + result: -oMa sender_host_address = V4NET.0.0.1 +considering: sender_host_port = $sender_host_port + expanding: sender_host_port = $sender_host_port + result: sender_host_port = 1234 +considering: -oMaa sender_host_authenticated = $sender_host_authenticated + expanding: -oMaa sender_host_authenticated = $sender_host_authenticated + result: -oMaa sender_host_authenticated = AAA +considering: -oMai authenticated_id = $authenticated_id + expanding: -oMai authenticated_id = $authenticated_id + result: -oMai authenticated_id = philip +considering: -oMas authenticated_sender = $authenticated_sender + expanding: -oMas authenticated_sender = $authenticated_sender + result: -oMas authenticated_sender = xx@yy.zz +considering: -oMi interface_address = $interface_address + expanding: -oMi interface_address = $interface_address + result: -oMi interface_address = 1.1.1.1 +considering: interface_port = $interface_port + expanding: interface_port = $interface_port + result: interface_port = 99 +considering: -oMr received_protocol = $received_protocol + expanding: -oMr received_protocol = $received_protocol + result: -oMr received_protocol = special +considering: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}} +considering: black}{white}{$sender_host_name}{No}} + expanding: black + result: black +considering: white}{$sender_host_name}{No}} + expanding: white + result: white + condition: eq{black}{white} + result: false + scanning: $sender_host_name}{No}} + expanding: $sender_host_name + result: + skipping: result is not used +considering: No}} + expanding: No + result: No + expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}} + result: ----> No lookup yet: No +considering: -oMs sender_host_name = $sender_host_name looking up host name for V4NET.0.0.1 IP address lookup yielded "ten-1.test.ex" ten-1.test.ex V4NET.0.0.1 mx=-1 sort=xx @@ -122,10 +166,11 @@ checking addresses for ten-1.test.ex V4NET.0.0.1 OK sender_fullhost = ten-1.test.ex [V4NET.0.0.1] sender_rcvhost = ten-1.test.ex ([V4NET.0.0.1] ident=me) -expanding: -oMs sender_host_name = $sender_host_name - result: -oMs sender_host_name = ten-1.test.ex -expanding: -oMt sender_ident = $sender_ident - result: -oMt sender_ident = me + expanding: -oMs sender_host_name = $sender_host_name + result: -oMs sender_host_name = ten-1.test.ex +considering: -oMt sender_ident = $sender_ident + expanding: -oMt sender_ident = $sender_ident + result: -oMt sender_ident = me >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective @@ -182,7 +227,7 @@ host in "< deny: condition test succeeded in ACL "connect1" end of ACL "connect1": DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=ten-1.test.ex [V4NET.0.0.1] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -226,7 +271,7 @@ host in "net-lsearch;TESTSUITE/aux-fixed/0002.lsearch"? no (end of list) deny: condition test failed in ACL "connect2" end of ACL "connect2": implicit DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=[V4NET.0.0.2] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0013 b/test/stderr/0013 index 78e7e579a..93af8e7a5 100644 --- a/test/stderr/0013 +++ b/test/stderr/0013 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 15 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 10 of TESTSUITE/test-config: extra characters follow string value for relay_hosts diff --git a/test/stderr/0022 b/test/stderr/0022 index 6451e758d..75c282029 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -26,6 +26,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<warn_empty@test.ex> using ACL "warn_empty" @@ -45,6 +47,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool//input//10HmbF-0005vi-00-D Data file written for message 10HmbF-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -92,6 +95,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<warn_log@test.ex> using ACL "warn_log" @@ -114,6 +119,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool//input//10HmbG-0005vi-00-D Data file written for message 10HmbG-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -161,6 +167,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<warn_user@test.ex> using ACL "warn_user" @@ -181,6 +189,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +Data file name: TESTSUITE/spool//input//10HmbH-0005vi-00-D Data file written for message 10HmbH-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] diff --git a/test/stderr/0038 b/test/stderr/0038 index 9f1632db5..8137d8777 100644 --- a/test/stderr/0038 +++ b/test/stderr/0038 @@ -9,6 +9,7 @@ >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/strict @@ -47,6 +48,7 @@ LOG: 10HmaX-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/strict @@ -84,6 +86,7 @@ LOG: 10HmaY-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/per_conn/strict @@ -122,6 +125,7 @@ LOG: 10HmaZ-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/per_conn/strict @@ -159,6 +163,7 @@ LOG: 10HmbA-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "warn" >>> check ratelimit = 0/1h/per_rcpt @@ -225,6 +230,7 @@ LOG: 10HmbB-0005vi-00 H=(test.ex) [V4NET.9.8.7] F=<> rejected after DATA >>> test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt2" >>> processing "warn" >>> check ratelimit = 1/1m/per_rcpt/noupdate diff --git a/test/stderr/0043 b/test/stderr/0043 index 3c6551479..55e719332 100644 --- a/test/stderr/0043 +++ b/test/stderr/0043 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0044 b/test/stderr/0044 index b261277c6..7c3fb0d3f 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : @@ -56,6 +57,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0070 b/test/stderr/0070 index c50f93612..dcfc4286c 100644 --- a/test/stderr/0070 +++ b/test/stderr/0070 @@ -258,6 +258,7 @@ MUNGED: ::1 will be omitted in what follows >>> rhubarb in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "rcpt" >>> processing "require" >>> message: helo not verified diff --git a/test/stderr/0079 b/test/stderr/0079 index 1fb29be98..c46c66aa1 100644 --- a/test/stderr/0079 +++ b/test/stderr/0079 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0080 b/test/stderr/0080 index c5a40d7ba..d9ea2bf81 100644 --- a/test/stderr/0080 +++ b/test/stderr/0080 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check recipients = postmaster@exim.test.ex diff --git a/test/stderr/0092 b/test/stderr/0092 index 4cae3dbf7..93f70e59c 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -50,30 +50,38 @@ LOG: smtp_connection MAIN SMTP connection from [V4NET.0.0.1] host in host_lookup? no (option unset) set_process_info: pppp handling incoming connection from [V4NET.0.0.1] -expanding: V4NET.0.0.1 - result: V4NET.0.0.1 -expanding: $sender_host_address - result: V4NET.0.0.1 -condition: eq {V4NET.0.0.1} {$sender_host_address} - result: true -expanding: 2 - result: 2 -expanding: 30 - result: 30 -skipping: result is not used -expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s - result: 2s +considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s +considering: V4NET.0.0.1} {$sender_host_address} {2} {30}}s + expanding: V4NET.0.0.1 + result: V4NET.0.0.1 +considering: $sender_host_address} {2} {30}}s + expanding: $sender_host_address + result: V4NET.0.0.1 + condition: eq {V4NET.0.0.1} {$sender_host_address} + result: true +considering: 2} {30}}s + expanding: 2 + result: 2 + scanning: 30}}s + expanding: 30 + result: 30 + skipping: result is not used + expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s + result: 2s host in host_reject_connection? no (option unset) host in sender_unqualified_hosts? no (option unset) 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) -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: 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:userx@test.ex +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:userx@test.ex using ACL "check_recipient" diff --git a/test/stderr/0094 b/test/stderr/0094 index 5ab751696..c0dbb7d26 100644 --- a/test/stderr/0094 +++ b/test/stderr/0094 @@ -109,6 +109,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<userx@test.ex> +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:<userx@test.ex> using ACL "check_recipient" diff --git a/test/stderr/0121 b/test/stderr/0121 index b578cce97..97cbca9da 100644 --- a/test/stderr/0121 +++ b/test/stderr/0121 @@ -172,16 +172,21 @@ LOG: 10HmaZ-0005vi-00 H=[127.0.0.1] F=<userx@test.ex> temporarily rejected after >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> foo.bar in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/0138 b/test/stderr/0138 index 5a69cc1cc..9c30eedec 100644 --- a/test/stderr/0138 +++ b/test/stderr/0138 @@ -9,6 +9,7 @@ >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : @@ -56,6 +57,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> exim.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : diff --git a/test/stderr/0143 b/test/stderr/0143 index 4be0d5227..3092135fd 100644 --- a/test/stderr/0143 +++ b/test/stderr/0143 @@ -14,22 +14,28 @@ router_name <my_main_router> transport_name <my_smtp> my_smtp transport entered userx@domain.com +hostlist: + 127.0.0.1:-1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com) Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-OK 250-HELP 250 AUTH LOGIN not using PIPELINING not using DSN SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 Sender OK SMTP>> RCPT TO:<userx@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Recipient OK SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 354 Send data SMTP>> writing message and terminating "." writing data block fd=dddd size=sss timeout=300 @@ -39,6 +45,8 @@ transport_check_waiting entered sequence=1 local_max=500 global_max=-1 no messages waiting for 127.0.0.1 SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> Leaving my_smtp transport LOG: MAIN => userx@domain.com R=my_main_router T=my_smtp H=127.0.0.1 [127.0.0.1] C="250 OK" diff --git a/test/stderr/0148 b/test/stderr/0148 index 1b5b73a21..789b2a92e 100644 --- a/test/stderr/0148 +++ b/test/stderr/0148 @@ -1,3 +1,3 @@ LOG: PANIC DIE - Exim configuration error in line 17 of TESTSUITE/test-config: + Exim configuration error in line 12 of TESTSUITE/test-config: missing quote at end of string value for hold_domains diff --git a/test/stderr/0180 b/test/stderr/0180 index 4fa53882e..7df430b70 100644 --- a/test/stderr/0180 +++ b/test/stderr/0180 @@ -9,6 +9,7 @@ >>> some.host in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -20,3 +21,4 @@ >>> some.host in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) diff --git a/test/stderr/0217 b/test/stderr/0217 index 259df4604..9e31fb1d0 100644 --- a/test/stderr/0217 +++ b/test/stderr/0217 @@ -413,6 +413,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550 NO SMTP<< 403 Sorry temp data error SMTP>> QUIT + SMTP(close)>> LOG: MAIN == yes@test.ex R=client T=send_to_server defer (-46) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 403 Sorry temp data error LOG: MAIN @@ -847,6 +848,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => w@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN diff --git a/test/stderr/0218 b/test/stderr/0218 index 4c74ff294..f9f1d6849 100644 --- a/test/stderr/0218 +++ b/test/stderr/0218 @@ -5,6 +5,7 @@ Single queue run LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories +looking in TESTSUITE/spool//input delivering 10HmaX-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -12,6 +13,7 @@ delivering 10HmaY-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) queue running combined directories +looking in TESTSUITE/spool//input delivering 10HmaX-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -28,6 +30,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 351 Send more SMTP>> writing message and terminating "." SMTP<< 250 OK + SMTP(close)>> LOG: MAIN => a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1] C="250 OK" LOG: MAIN @@ -48,6 +51,7 @@ T: send_to_server (ACL) SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK" LOG: MAIN @@ -63,6 +67,7 @@ Single queue run LOG: queue_run MAIN Start queue run: pid=pppp -qq queue running combined directories +looking in TESTSUITE/spool//input delivering 10HmaZ-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -70,6 +75,7 @@ delivering 10HmbA-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) queue running combined directories +looking in TESTSUITE/spool//input delivering 10HmaZ-0005vi-00 (queue run pid ppppp) R: client (ACL) T: send_to_server (ACL) @@ -85,8 +91,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 503 Unexpected RCPT SMTP<< 503 Unexpected DATA SMTP>> QUIT + SMTP(close)>> LOG: MAIN - ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@test.ex>: 550 NO + ** a@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@test.ex>: 550 NO Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user @@ -142,6 +149,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 503 Unexpected DATA SMTP>> RSET SMTP<< 250 OK + SMTP(close)>> LOG: MAIN ** b@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@test.ex>: 550 Unknown Exim version x.yz .... @@ -169,6 +177,7 @@ T: send_to_server (ACL) SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => c@test.ex F=<CALLER@test.ex> R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* C="250 OK" LOG: MAIN diff --git a/test/stderr/0227 b/test/stderr/0227 index 7a75ec015..d676f05a7 100644 --- a/test/stderr/0227 +++ b/test/stderr/0227 @@ -9,6 +9,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<ok@localhost> SMTP<< 250 OK SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT LOG: smtp_connection MAIN @@ -26,6 +28,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<bad@localhost> SMTP<< 550 Unknown user SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 Unknown user LOG: MAIN REJECT @@ -43,6 +47,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<uncheckable@localhost1> SMTP<< 450 Temporary error SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify defer for <uncheckable@localhost1>: response to "RCPT TO:<uncheckable@localhost1>" from 127.0.0.1 [127.0.0.1] was: 450 Temporary error LOG: MAIN REJECT @@ -58,6 +64,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP<< 550 Error for <> SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable2@localhost1>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 Error for <> LOG: MAIN REJECT @@ -74,6 +82,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550-Multiline error for <> 550 Here's the second line SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for <uncheckable@localhost1>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550-Multiline error for <>\n550 Here's the second line LOG: MAIN REJECT @@ -91,6 +101,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<z@remote.domain> SMTP<< 550 Recipient not liked SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked LOG: smtp_connection MAIN @@ -107,6 +119,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 550-Recipient not liked on two lines 550 Here's the second SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.domain>: response to "RCPT TO:<z@remote.domain>" from 127.0.0.1 [127.0.0.1] was: 550-Recipient not liked on two lines\n550 Here's the second LOG: smtp_connection MAIN @@ -130,6 +144,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<abcd@x.y.z> SMTP<< 550 Not liked SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line LOG: smtp_connection MAIN @@ -145,6 +161,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<abcd@x.y.z> SMTP<< 550 Not liked SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.4] U=root F=<uncheckable@localhost1> rejected after DATA: there is no valid sender in any header line LOG: smtp_connection MAIN @@ -167,6 +185,8 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@localhost1> SMTP<< 250 OK SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.5] U=root F=<ok@localhost1> rejected RCPT <z@remote.domain>: relay not permitted LOG: smtp_connection MAIN @@ -189,6 +209,8 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@localhost1> SMTP<< 550 Don't like postmaster SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.5] U=root sender verify fail for <ok@localhost1>: response to "RCPT TO:<postmaster@localhost1>" from 127.0.0.1 [127.0.0.1] was: 550 Don't like postmaster LOG: MAIN REJECT @@ -199,6 +221,23 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready + SMTP>> EHLO myhost.test.ex + SMTP<< 250- wotcher + 250-SIZE + 250 OK + SMTP>> MAIL FROM:<> + SMTP<< 250 OK + SMTP>> RCPT TO:<ok@localhost1> + SMTP<< 250 OK + SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> +LOG: smtp_connection MAIN + SMTP connection from root closed by QUIT +LOG: smtp_connection MAIN + SMTP connection from root +Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected + SMTP<< 220 Server ready SMTP>> LHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM:<> @@ -206,6 +245,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<z@remote.lmtp> SMTP<< 550 Recipient not liked SMTP>> QUIT + SMTP<< 250 OK + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.3] U=root F=<uncheckable@localhost1> rejected RCPT <z@remote.lmtp>: response to "RCPT TO:<z@remote.lmtp>" from 127.0.0.1 [127.0.0.1] was: 550 Recipient not liked LOG: smtp_connection MAIN @@ -214,6 +255,7 @@ LOG: smtp_connection MAIN SMTP connection from root Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> QUIT + SMTP(close)>> LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify defer for <bad@localhost1>: response to "initial connection" from 127.0.0.1 [127.0.0.1] was: connection dropped LOG: MAIN REJECT diff --git a/test/stderr/0236 b/test/stderr/0236 index 193370cc8..f51e4e8cf 100644 --- a/test/stderr/0236 +++ b/test/stderr/0236 @@ -1,3 +1,3 @@ LOG: PANIC DIE - Exim configuration error in line 15 of TESTSUITE/test-config: + Exim configuration error in line 10 of TESTSUITE/test-config: macro name too long (maximum is 63 characters) diff --git a/test/stderr/0243 b/test/stderr/0243 index 9b8717fde..dac2ea6e7 100644 --- a/test/stderr/0243 +++ b/test/stderr/0243 @@ -9,6 +9,7 @@ >>> xxxx in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "deny" >>> message: unrouteable address diff --git a/test/stderr/0275 b/test/stderr/0275 index bb642b01b..5f76af09a 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -127,6 +127,8 @@ DSN: r3 propagating DSN originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -141,6 +143,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 (Exim x.yz) @@ -149,11 +152,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -179,6 +183,7 @@ DSN: r2 propagating DSN DSN: r3 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -192,7 +197,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -301,7 +306,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -330,7 +335,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0276 b/test/stderr/0276 index 2b01713f8..030801927 100644 --- a/test/stderr/0276 +++ b/test/stderr/0276 @@ -14,6 +14,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP<< 500 NO SMTP>> QUIT + SMTP(close)>> LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined DATA: 500 NO LOG: MAIN @@ -47,6 +48,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> DATA SMTP<< 500 NO SMTP>> QUIT + SMTP(close)>> LOG: MAIN ** userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after DATA: 500 NO LOG: MAIN diff --git a/test/stderr/0278 b/test/stderr/0278 index fd5795b04..2d9967293 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -78,6 +78,8 @@ DSN: r5 propagating DSN originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: CALLER@test.ex @@ -92,6 +94,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 (Exim x.yz) @@ -100,11 +103,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for CALLER@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -126,6 +130,7 @@ DSN: r4 propagating DSN DSN: r5 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -139,7 +144,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: CALLER@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -203,7 +208,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> CALLER@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -232,7 +237,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -CALLER@test.ex: no retry items + CALLER@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0290 b/test/stderr/0290 index cd1712e9f..da5938424 100644 --- a/test/stderr/0290 +++ b/test/stderr/0290 @@ -1,3 +1,3 @@ LOG: PANIC DIE - Exim configuration error in line 27 of TESTSUITE/test-config: + Exim configuration error in line 22 of TESTSUITE/test-config: .include specifies a non-absolute path "non/absolute" diff --git a/test/stderr/0294 b/test/stderr/0294 index 24da1eb2d..c020fda0f 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -9,6 +9,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:<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 SMTP>> 250 OK SMTP<< rcpt to:<one@z> SMTP>> 250 Accepted @@ -38,6 +40,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> 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) @@ -45,7 +48,8 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) 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.pppp +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 @@ -54,6 +58,8 @@ SMTP>> 250 OK id=10HmaX-0005vi-00 smtp_setup_msg entered SMTP<< mail from:<x@y> 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:<two@z> SMTP>> 250 Accepted @@ -67,6 +73,7 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> 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) @@ -75,7 +82,8 @@ P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz) 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.pppp +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 @@ -83,6 +91,8 @@ SMTP>> 250 OK id=10HmaY-0005vi-00 smtp_setup_msg entered SMTP<< mail from:<x@y> 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 @@ -108,6 +118,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<one@z> processing "deny" @@ -154,6 +166,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<one@z> processing "deny" @@ -193,6 +207,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:<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 SMTP>> 250 OK SMTP<< rcpt to:<reject@z> SMTP>> 550 Administrative prohibition @@ -222,6 +238,8 @@ SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> 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:<reject@z> SMTP>> 550 Administrative prohibition @@ -231,6 +249,8 @@ SMTP<< rset SMTP>> 250 Reset OK SMTP<< mail from:<x@y> 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 diff --git a/test/stderr/0303 b/test/stderr/0303 index 02f42e0a0..0a78b30f0 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -26,6 +26,7 @@ >>> V4NET.0.0.1 OK >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -69,12 +70,15 @@ sender_rcvhost = [V4NET.2.3.4] set_process_info: pppp handling incoming connection from ([V4NET.2.3.4]) [V4NET.2.3.4] 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 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" @@ -90,6 +94,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.2.3.4] @@ -141,12 +146,15 @@ sender_rcvhost = host.name.tld ([V4NET.2.3.4]) set_process_info: pppp handling incoming connection from host.name.tld [V4NET.2.3.4] 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 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" @@ -162,6 +170,7 @@ search_tidyup called search_tidyup called >>Headers after rewriting and local additions: +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 host.name.tld ([V4NET.2.3.4]) diff --git a/test/stderr/0314 b/test/stderr/0314 deleted file mode 100644 index e14297ea5..000000000 --- a/test/stderr/0314 +++ /dev/null @@ -1,12 +0,0 @@ ->>> host in hosts_connection_nolog? no (option unset) ->>> host in host_lookup? no (option unset) ->>> host in host_reject_connection? yes (matched "V4NET.0.0.1") -LOG: refused connection from [V4NET.0.0.1] (host_reject_connection) ->>> host in hosts_connection_nolog? no (option unset) ->>> host in host_lookup? no (option unset) ->>> host in host_reject_connection? no (end of list) ->>> host in sender_unqualified_hosts? no (option unset) ->>> 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) diff --git a/test/stderr/0317 b/test/stderr/0317 index 8cd90b29b..b71581e68 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -3,6 +3,8 @@ configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex +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 Sender: CALLER@test.ex >>Headers received: To: x@y.z @@ -17,6 +19,7 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 mail.test.ex with local (Exim x.yz) @@ -24,7 +27,8 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -35,6 +39,8 @@ configuration file is TESTSUITE/test-config admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex +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 Sender: CALLER@test.ex >>Headers received: To: x@y.z @@ -55,6 +61,7 @@ C Resent-cc: pp@qq.rr * Resent-bcc: xx@yy.zz F Resent-From: CALLER_NAME <CALLER@test.ex> +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 mail.test.ex with local (Exim x.yz) @@ -62,7 +69,8 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) id 10HmaY-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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0348 b/test/stderr/0348 index d2c59c2ad..70311339f 100644 --- a/test/stderr/0348 +++ b/test/stderr/0348 @@ -1,8 +1,8 @@ -1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config: bad parameters for retry rule -1999-03-02 09:44:33 Exim configuration error in line 25 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 20 of TESTSUITE/test-config: bad parameters for retry rule diff --git a/test/stderr/0357 b/test/stderr/0357 index 6073e8c62..9cc0a6bb5 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -33,7 +33,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt @@ -84,7 +84,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:userx@test.ex deleted retry information for R:test.ex @@ -138,7 +138,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:userx@test.ex deleted retry information for R:test.ex @@ -176,7 +176,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items end of retry processing LOG: queue_run MAIN End queue run: pid=pppp diff --git a/test/stderr/0358 b/test/stderr/0358 index 7eec3d43f..6f75cf630 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -43,14 +43,14 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -usery@test.ex + usery@test.ex locking TESTSUITE/spool/db/retry.lockfile retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:usery@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error -userx@test.ex + userx@test.ex retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex:<CALLER@test.ex> @@ -121,7 +121,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -usery@test.ex + usery@test.ex locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:usery@test.ex deleted retry information for R:test.ex @@ -130,7 +130,7 @@ failing_interval=ttt message_age=ttt Writing retry data for R:usery@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error -userx@test.ex + userx@test.ex deleted retry information for R:userx@test.ex deleted retry information for R:test.ex retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 diff --git a/test/stderr/0361 b/test/stderr/0361 index 43bcdbf84..2506e1cfb 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -21,6 +21,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: kilos@recurse.test.ex @@ -35,6 +37,7 @@ I Message-Id: <E10HmaY-0005vi-00@the.local.host.name> F From: CALLER_NAME <CALLER@test.ex> 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 the.local.host.name with local (Exim x.yz) @@ -43,11 +46,12 @@ P Received: from CALLER by the.local.host.name with local (Exim x.yz) for kilos@recurse.test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |kilos@recurse.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -67,6 +71,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -80,7 +85,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: kilos@recurse.test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -116,7 +121,7 @@ rewrite_one_header: type=F: From: CALLER_NAME <CALLER@test.ex> re-routed to kilos@recurse.test.ex.test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -155,7 +160,7 @@ routed by r3 router envelope to: kilos@recurse.test.ex.test.ex transport: <none> locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -203,7 +208,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> kilos@recurse.test.ex.test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available diff --git a/test/stderr/0362 b/test/stderr/0362 index c2b6e25f4..913901e15 100644 --- a/test/stderr/0362 +++ b/test/stderr/0362 @@ -27,6 +27,8 @@ host in helo_accept_junk_hosts? no (option unset) SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered 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 SMTP>> 250 OK SMTP<< rcpt to:<x@a.b.c> using ACL "check_rcpt" diff --git a/test/stderr/0364 b/test/stderr/0364 index f648839f1..d6a49bbf6 100644 --- a/test/stderr/0364 +++ b/test/stderr/0364 @@ -81,7 +81,7 @@ r2 router declined for solik@otherhost.test.ex --------> r3 router <-------- local_part=solik domain=otherhost.test.ex checking domains -checking "condition" +checking "condition" "${if eq{$address_data}{}{no}{yes}}"... processing address_data calling r3 router rda_interpret (string): $local_part@$original_domain.sub.test.ex @@ -107,7 +107,7 @@ r2 router declined for solik@otherhost.sub.test.ex --------> r3 router <-------- local_part=solik domain=otherhost.sub.test.ex checking domains -checking "condition" +checking "condition" "${if eq{$address_data}{}{no}{yes}}"... r3 router skipped: condition failure --------> r4 router <-------- local_part=solik domain=otherhost.sub.test.ex @@ -184,7 +184,7 @@ r2 router declined for xxx@testsub.test.ex --------> r3 router <-------- local_part=xxx domain=testsub.test.ex checking domains -checking "condition" +checking "condition" "${if eq{$address_data}{}{no}{yes}}"... processing address_data calling r3 router rda_interpret (string): $local_part@$original_domain.sub.test.ex diff --git a/test/stderr/0371 b/test/stderr/0371 index 534a643f3..1cdf00177 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -37,12 +37,15 @@ 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-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" check set acl_c0 = $acl_c0; mail @@ -75,6 +78,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) @@ -119,6 +123,8 @@ 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" check set acl_c0 = $acl_c0; mail diff --git a/test/stderr/0376 b/test/stderr/0376 index 310e1a101..652477e75 100644 --- a/test/stderr/0376 +++ b/test/stderr/0376 @@ -21,9 +21,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<ok@localhost> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@localhost LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -59,6 +61,7 @@ callout cache: found domain record for localhost callout cache: address record expired for ok@localhost interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +connect: Connection refused LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: could not connect to 127.0.0.1 [127.0.0.1]: Connection refused created log directory TESTSUITE/spool/log @@ -90,9 +93,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<bad@localhost> SMTP<< 550 REJECTED SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for localhost: result=1 postmaster=0 random=0 -wrote negative callout cache address record +wrote negative callout cache address record for bad@localhost LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for <bad@localhost>: response to "RCPT TO:<bad@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 REJECTED LOG: MAIN REJECT @@ -142,7 +147,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> MAIL FROM:<> SMTP<< 550 REJECT MAIL FROM SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for localhost: result=3 postmaster=0 random=0 LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for <ok@localhost>: response to "MAIL FROM:<>" from 127.0.0.1 [127.0.0.1] was: 550 REJECT MAIL FROM @@ -201,9 +208,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@otherhost> SMTP<< 550 NOT OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost: result=1 postmaster=2 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost LOG: MAIN REJECT H=[V4NET.0.0.2] U=root sender verify fail for <ok@otherhost>: response to "RCPT TO:<postmaster@otherhost>" from 127.0.0.1 [127.0.0.1] was: 550 NOT OK LOG: MAIN REJECT @@ -261,9 +270,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@otherhost2> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost2: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost2 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -308,7 +319,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost3> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost3: result=1 postmaster=0 random=1 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT @@ -352,7 +365,9 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost4> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost4: result=1 postmaster=0 random=1 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT @@ -409,9 +424,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@otherhost41> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost41: result=1 postmaster=1 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost41 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -464,9 +481,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@otherhost21> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -494,9 +513,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<ok2@otherhost21> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost21: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok2@otherhost21 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -529,9 +550,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<ok@otherhost31> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -559,9 +582,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<okok@otherhost31> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for okok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -594,9 +619,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<okokok@otherhost31> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost31: result=1 postmaster=0 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for okokok@otherhost31 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -622,7 +649,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO:<myhost.test.ex-dddddddd-testing@otherhost51> SMTP timeout -wrote callout cache domain record: + SMTP(close)>> +wrote callout cache domain record for otherhost51: result=1 postmaster=0 random=0 LOG: MAIN REJECT H=[V4NET.0.0.5] U=root sender verify defer for <okok@otherhost51>: Could not complete sender verify callout @@ -661,9 +689,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@otherhost52> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost52: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for okokok@otherhost52 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -691,9 +721,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<abcd@x.y.z> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for abcd@x.y.z/<somesender@a.domain> LOG: MAIN <= ok7@otherhost53 H=[V4NET.0.0.7] U=root P=smtp S=sss LOG: smtp_connection MAIN @@ -722,7 +754,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO:<abcd@x.y.z> SMTP timeout -wrote callout cache domain record: + SMTP(close)>> +wrote callout cache domain record for x.y.z: result=1 postmaster=0 random=0 LOG: MAIN <= ok7@otherhost53 H=[V4NET.0.0.8] U=root P=smtp S=sss @@ -761,9 +794,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for otherhost9: result=1 postmaster=1 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for ok@otherhost9 LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -803,9 +838,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@test.ex> SMTP<< 250 OK SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for test.ex: result=1 postmaster=1 random=2 -wrote positive callout cache address record +wrote positive callout cache address record for z@test.ex/<postmaster@myhost.test.ex> LOG: smtp_connection MAIN SMTP connection from root closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0377 b/test/stderr/0377 index ca3949890..848ee3367 100644 --- a/test/stderr/0377 +++ b/test/stderr/0377 @@ -63,7 +63,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... cccc_2nd_time router skipped: condition failure --------> cccc_redirect router <-------- local_part=cccc domain=myhost.test.ex @@ -101,7 +101,7 @@ seen_aaaa router skipped: local_parts mismatch --------> bbbb router <-------- local_part=bbbb domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... calling bbbb router rda_interpret (string): bbbb@$domain, defer_bbbb@$domain expanded: bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex @@ -127,7 +127,7 @@ defer router skipped: local_parts mismatch --------> unseen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... calling unseen_aaaa router rda_interpret (string): defer_aaaa@$domain expanded: defer_aaaa@myhost.test.ex @@ -207,7 +207,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... cccc_2nd_time router skipped: condition failure --------> cccc_redirect router <-------- cccc_redirect router skipped: previously routed cccc@myhost.test.ex @@ -376,7 +376,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling cccc_2nd_time router rda_interpret (string): $local_part@$domain expanded: cccc@myhost.test.ex @@ -406,7 +406,7 @@ seen_aaaa router skipped: local_parts mismatch --------> bbbb router <-------- local_part=bbbb domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... bbbb router skipped: condition failure --------> bbbb_0 router <-------- local_part=bbbb domain=myhost.test.ex @@ -431,7 +431,7 @@ defer router skipped: local_parts mismatch --------> unseen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... unseen_aaaa router skipped: condition failure --------> seen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex @@ -627,7 +627,7 @@ bbbb_0 router skipped: local_parts mismatch --------> cccc_2nd_time router <-------- local_part=cccc domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling cccc_2nd_time router rda_interpret (string): $local_part@$domain expanded: cccc@myhost.test.ex @@ -657,7 +657,7 @@ seen_aaaa router skipped: local_parts mismatch --------> bbbb router <-------- local_part=bbbb domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... bbbb router skipped: condition failure --------> bbbb_0 router <-------- local_part=bbbb domain=myhost.test.ex @@ -682,7 +682,7 @@ defer router skipped: local_parts mismatch --------> unseen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{yes}{no}}"... unseen_aaaa router skipped: condition failure --------> seen_aaaa router <-------- local_part=aaaa domain=myhost.test.ex diff --git a/test/stderr/0378 b/test/stderr/0378 index bb7b4a40a..d82f049a7 100644 --- a/test/stderr/0378 +++ b/test/stderr/0378 @@ -35,7 +35,7 @@ defer router skipped: local_parts mismatch --------> aaaa_2nd_time router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... aaaa_2nd_time router skipped: condition failure --------> aaaa router <-------- local_part=aaaa domain=myhost.test.ex @@ -212,7 +212,7 @@ defer router skipped: local_parts mismatch --------> aaaa_2nd_time router <-------- local_part=aaaa domain=myhost.test.ex checking local_parts -checking "condition" +checking "condition" "${if first_delivery{no}{yes}}"... calling aaaa_2nd_time router rda_interpret (string): aaaa@$domain expanded: aaaa@myhost.test.ex diff --git a/test/stderr/0381 b/test/stderr/0381 index d5e9ee6fc..cd98205f2 100644 --- a/test/stderr/0381 +++ b/test/stderr/0381 @@ -28,6 +28,8 @@ 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:<notgov@test.ex> +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@test.ex> using ACL "check_rcpt" diff --git a/test/stderr/0384 b/test/stderr/0384 index 63ba003cd..1906cbd2d 100644 --- a/test/stderr/0384 +++ b/test/stderr/0384 @@ -10,6 +10,7 @@ >>> matched host address >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> [1.2.3.4] in helo_lookup_domains? no (end of list) >>> verifying EHLO/HELO argument "[1.2.3.4]" diff --git a/test/stderr/0386 b/test/stderr/0386 index 3232ada03..00094863b 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -29,6 +29,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<1@b> read ACL from file TESTSUITE/aux-fixed/0386.acl1 @@ -76,6 +78,8 @@ LOG: MAIN REJECT SMTP<< rset SMTP>> 250 Reset OK 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 SMTP>> 250 OK SMTP<< rcpt to:<1@b> using ACL "TESTSUITE/aux-fixed/0386.acl1" @@ -158,6 +162,8 @@ 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:<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 SMTP>> 250 OK SMTP<< rcpt to:<2@b> read ACL from file TESTSUITE/aux-fixed/0386.acl2 @@ -191,6 +197,7 @@ host in ignore_fromline_hosts? no (option unset) 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.11.12.13] (ident=CALLER) @@ -204,11 +211,12 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) >> calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss @@ -228,6 +236,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = [V4NET.11.12.13] @@ -243,7 +252,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: 2@b locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -280,7 +289,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -318,7 +327,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -2@b: no retry items + 2@b: no retry items Failed addresses: Deferred addresses: end of retry processing @@ -340,6 +349,8 @@ smtp_setup_msg entered SMTP<< rset SMTP>> 250 Reset OK 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 SMTP>> 250 OK SMTP<< rcpt to:<2@b> using ACL "TESTSUITE/aux-fixed/0386.acl2" @@ -368,6 +379,7 @@ host in ignore_fromline_hosts? no (option unset) search_tidyup called >>Headers after rewriting and local additions: +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 [V4NET.11.12.13] (ident=CALLER) @@ -381,11 +393,12 @@ P Received: from [V4NET.11.12.13] (ident=CALLER) >> calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |2@b| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y H=[V4NET.11.12.13] U=CALLER P=smtp S=sss @@ -405,6 +418,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_fullhost = [V4NET.11.12.13] @@ -420,7 +434,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: 2@b locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -456,7 +470,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> 2@b <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -494,7 +508,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: -2@b: no retry items + 2@b: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0388 b/test/stderr/0388 index 5f4680130..92b3f23e1 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -8,7 +8,7 @@ DSN: r1 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -75,7 +75,7 @@ changed uid/gid: remote delivery to x@y with transport=smtp set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -85,23 +85,28 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250 OK 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<x@y> +cmd buf flush ddd bytes SMTP<< 451 Temporary error LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") *@127.0.0.1 in "*"? yes (matched "*") checking status of V4NET.0.0.0 locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -129,9 +134,9 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -x@y + x@y locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR @@ -159,6 +164,7 @@ dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded +closed hints database and lockfile end of retry processing exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 Exim version x.yz .... @@ -174,6 +180,8 @@ DSN: r1 propagating DSN originator: uid=EXIM_UID gid=EXIM_GID login=EXIMUSER name= sender address = set_process_info: pppp accepting a local non-SMTP message 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 Sender: search_tidyup called >>Headers received: @@ -201,6 +209,7 @@ T To: CALLER@myhost.test.ex I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> 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 EXIMUSER by myhost.test.ex with local (Exim x.yz) @@ -208,7 +217,8 @@ P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) for CALLER@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss @@ -225,7 +235,7 @@ DSN: r1 propagating DSN set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY @@ -238,6 +248,7 @@ dbfn_read: key=R:CALLER@myhost.test.ex:<> no domain retry record no address retry record CALLER@myhost.test.ex: queued for routing +closed hints database and lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing CALLER@myhost.test.ex --------> r0 router <-------- @@ -268,7 +279,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: -CALLER@myhost.test.ex: no retry items + CALLER@myhost.test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing @@ -279,7 +290,8 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN Completed diff --git a/test/stderr/0391 b/test/stderr/0391 index 31fd790e9..783db01c5 100644 --- a/test/stderr/0391 +++ b/test/stderr/0391 @@ -24,6 +24,8 @@ 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:<U@W.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 SMTP>> 250 OK SMTP<< rcpt to:<B@a.b.c> using ACL "acl_rcpt" diff --git a/test/stderr/0393 b/test/stderr/0393 index c40aa6f52..dd0887f09 100644 --- a/test/stderr/0393 +++ b/test/stderr/0393 @@ -27,7 +27,7 @@ lock file created mailbox TESTSUITE/test-mail/userx is locked writing to file TESTSUITE/test-mail/userx writing data block fd=dddd size=sss timeout=0 -process pppp running as transport filter: write=dddd read=dddd +process pppp running as transport filter: fd_write=dddd fd_read=dddd writing data block fd=dddd size=sss timeout=0 process pppp writing to transport filter copying from the filter diff --git a/test/stderr/0396 b/test/stderr/0396 index 24b785652..427b7b43a 100644 --- a/test/stderr/0396 +++ b/test/stderr/0396 @@ -14,6 +14,8 @@ LOG: smtp_connection MAIN SMTP>> 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered 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 SMTP>> 250 OK SMTP<< rcpt to:<x@y> processing "accept" diff --git a/test/stderr/0398 b/test/stderr/0398 index 17d580669..7489a19a1 100644 --- a/test/stderr/0398 +++ b/test/stderr/0398 @@ -18,6 +18,8 @@ LOG: smtp_connection MAIN SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< mail from:<qq@remote> +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:<abc@local> using ACL "rcpt" @@ -117,7 +119,7 @@ routed by r2 router host 127.0.0.1 [127.0.0.1] Attempting full verification using callout locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile +locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR @@ -125,28 +127,36 @@ dbfn_read: key=remote callout cache: found domain record for remote dbfn_read: key=qq@remote callout cache: no address record found for qq@remote +closed hints database and lockfile interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO mail.test.ex +cmd buf flush ddd bytes SMTP<< 250 OK 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<qq@remote> +cmd buf flush ddd bytes SMTP<< 550 Unknown SMTP>> QUIT +cmd buf flush ddd bytes + SMTP<< 250 OK + SMTP(close)>> locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile +locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT dbfn_write: key=remote -wrote callout cache domain record: +wrote callout cache domain record for remote: result=1 postmaster=0 random=0 dbfn_write: key=qq@remote -wrote negative callout cache address record +wrote negative callout cache address record for qq@remote +closed hints database and lockfile ----------- end verify ------------ l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" @@ -218,7 +228,7 @@ routed by r2 router host 127.0.0.1 [127.0.0.1] Attempting full verification using callout locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile +locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR @@ -227,6 +237,7 @@ callout cache: found domain record for remote dbfn_read: key=qq@remote callout cache: found address record for qq@remote callout cache: address record is negative +closed hints database and lockfile ----------- end verify ------------ l_message: $acl_verify_message warn: condition test succeeded in ACL "rcpt" diff --git a/test/stderr/0402 b/test/stderr/0402 index c0a03d3ee..9aa1f596e 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -19,6 +19,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: CALLER@test.ex @@ -37,58 +39,111 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: false -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: false + scanning: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=) + result: (helo=) -skipping: result is not used -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + skipping: result is not used + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + result: from CALLER + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@test.ex>) + result: (envelope-from <CALLER@test.ex>) -condition: def:received_for - result: false -expanding: + condition: def:received_for + result: false + scanning: + for $received_for}} + expanding: for $received_for - result: + result: for -skipping: result is not used + skipping: result is not used + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER by mail.test.ex with local (Exim x.yz) + (envelope-from <CALLER@test.ex>) + id 10HmaX-0005vi-00 >>Generated Received: header line P Received: from CALLER by mail.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000 calling local_scan(); timeout=300 local_scan() returned 0 NULL -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -101,6 +156,7 @@ DSN: Flags :0 DSN: **** SPOOL_OUT - address: |rd+CALLER@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |rd+usery@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -126,6 +182,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -151,7 +208,7 @@ Delivery address list: rd+CALLER@test.ex rd+usery@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -214,8 +271,9 @@ local_part=rd+usery domain=test.ex stripped prefix rd+ checking local_parts usery in "usery"? yes (matched "usery") -expanding: /non-exist/$domain - result: /non-exist/test.ex +considering: /non-exist/$domain + expanding: /non-exist/$domain + result: /non-exist/test.ex calling r5 router rda_interpret (string): TESTSUITE/test-mail/junk expanded: TESTSUITE/test-mail/junk @@ -252,8 +310,9 @@ local_part=rd+CALLER domain=test.ex stripped prefix rd+ checking local_parts CALLER in "CALLER"? yes (matched "CALLER") -expanding: /non-exist/$local_part - result: /non-exist/CALLER +considering: /non-exist/$local_part + expanding: /non-exist/$local_part + result: /non-exist/CALLER calling r4 router rda_interpret (string): TESTSUITE/test-mail/junk expanded: TESTSUITE/test-mail/junk @@ -284,8 +343,9 @@ r2 router skipped: local_parts mismatch local_part=userz domain=test.ex checking local_parts userz in "userz"? yes (matched "userz") -expanding: /non-exist/$domain - result: /non-exist/test.ex +considering: /non-exist/$domain + expanding: /non-exist/$domain + result: /non-exist/test.ex calling r3 router r3 router called for userz@test.ex domain = test.ex @@ -308,8 +368,9 @@ r1 router skipped: local_parts mismatch local_part=usery domain=test.ex checking local_parts usery in "usery"? yes (matched "usery") -expanding: /non-exist/$domain - result: /non-exist/test.ex +considering: /non-exist/$domain + expanding: /non-exist/$domain + result: /non-exist/test.ex calling r2 router r2 router called for usery@test.ex domain = test.ex @@ -327,8 +388,9 @@ routing CALLER@test.ex local_part=CALLER domain=test.ex checking local_parts CALLER in "CALLER"? yes (matched "CALLER") -expanding: /non-exist/$local_part - result: /non-exist/CALLER +considering: /non-exist/$local_part + expanding: /non-exist/$local_part + result: /non-exist/CALLER calling r1 router r1 router called for CALLER@test.ex domain = test.ex @@ -341,7 +403,7 @@ routed by r1 router envelope to: CALLER@test.ex transport: t1 locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -368,20 +430,22 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available -expanding: /non-exist/$local_part - result: /non-exist/usery +considering: /non-exist/$local_part + expanding: /non-exist/$local_part + result: /non-exist/usery search_tidyup called changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail/junk> transport=ft1 uid=CALLER_UID gid=CALLER_GID pid=pppp home=/non-exist/usery current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered -expanding: $address_file - result: TESTSUITE/test-mail/junk +considering: $address_file + expanding: $address_file + result: TESTSUITE/test-mail/junk appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/junk format=unix message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n @@ -393,16 +457,22 @@ hitch name: TESTSUITE/test-mail/junk.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/junk is locked writing to file TESTSUITE/test-mail/junk -condition: def:return_path - result: true -expanding: $return_path - result: CALLER@test.ex -expanding: MAILER-DAEMON - result: MAILER-DAEMON -skipping: result is not used -expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} +considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + + condition: def:return_path + result: true +considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + + expanding: $return_path + result: CALLER@test.ex + scanning: MAILER-DAEMON}} ${tod_bsdinbox} + + expanding: MAILER-DAEMON + result: MAILER-DAEMON + skipping: result is not used + expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} - result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 + result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 @@ -418,7 +488,7 @@ LOG: MAIN => TESTSUITE/test-mail/junk <rd+usery@test.ex> R=r5 T=ft1 --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -428,8 +498,9 @@ changed uid/gid: local delivery to TESTSUITE/test-mail/junk <TESTSUITE/test-mail home=/non-exist/CALLER current=/ set_process_info: pppp delivering 10HmaX-0005vi-00 to TESTSUITE/test-mail/junk using ft1 appendfile transport entered -expanding: $address_file - result: TESTSUITE/test-mail/junk +considering: $address_file + expanding: $address_file + result: TESTSUITE/test-mail/junk appendfile: mode=600 notify_comsat=0 quota=0 warning=0 file=TESTSUITE/test-mail/junk format=unix message_prefix=From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}\n @@ -441,16 +512,22 @@ hitch name: TESTSUITE/test-mail/junk.lock.test.ex.dddddddd.pppppppp lock file created mailbox TESTSUITE/test-mail/junk is locked writing to file TESTSUITE/test-mail/junk -condition: def:return_path - result: true -expanding: $return_path - result: CALLER@test.ex -expanding: MAILER-DAEMON - result: MAILER-DAEMON -skipping: result is not used -expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} +considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + + condition: def:return_path + result: true +considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox} + + expanding: $return_path + result: CALLER@test.ex + scanning: MAILER-DAEMON}} ${tod_bsdinbox} + + expanding: MAILER-DAEMON + result: MAILER-DAEMON + skipping: result is not used + expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox} - result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 + result: From CALLER@test.ex Tue Mar 02 09:44:33 1999 writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 @@ -466,7 +543,7 @@ LOG: MAIN => TESTSUITE/test-mail/junk <rd+CALLER@test.ex> R=r4 T=ft1 --------> CALLER@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -491,12 +568,13 @@ LOG: MAIN => CALLER <CALLER@test.ex> R=r1 T=t1 --------> usery@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available -expanding: /non-exist/$local_part - result: /non-exist/usery +considering: /non-exist/$local_part + expanding: /non-exist/$local_part + result: /non-exist/usery search_tidyup called changed uid/gid: local delivery to usery <usery@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -518,12 +596,13 @@ LOG: MAIN => usery <usery@test.ex> R=r2 T=t1 --------> userz@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available -expanding: /$local_part - result: /userz +considering: /$local_part + expanding: /$local_part + result: /userz search_tidyup called changed uid/gid: local delivery to userz <userz@test.ex> transport=t2 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -549,15 +628,15 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userz@test.ex: no retry items -usery@test.ex: no retry items -CALLER@test.ex: no retry items -TESTSUITE/test-mail/junk: no retry items -rd+CALLER@test.ex: no retry items -TESTSUITE/test-mail/junk: no retry items -rd+usery@test.ex: no retry items -rd+CALLER@test.ex: no retry items -rd+usery@test.ex: no retry items + userz@test.ex: no retry items + usery@test.ex: no retry items + CALLER@test.ex: no retry items + TESTSUITE/test-mail/junk: no retry items + rd+CALLER@test.ex: no retry items + TESTSUITE/test-mail/junk: no retry items + rd+usery@test.ex: no retry items + rd+CALLER@test.ex: no retry items + rd+usery@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0403 b/test/stderr/0403 index 96e990bfd..716cabdf2 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -25,6 +27,7 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 mail.test.ex with local (Exim x.yz) @@ -33,11 +36,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +59,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -68,7 +73,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -131,7 +136,7 @@ routed by r1 router envelope to: userx@test.ex transport: <none> locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -150,7 +155,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail/junk <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available diff --git a/test/stderr/0404 b/test/stderr/0404 index 1f791c416..d3d8f4c64 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -14,6 +14,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx @@ -125,6 +127,7 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 mail.test.ex with local (Exim x.yz) @@ -133,11 +136,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -158,6 +162,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -171,7 +176,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -214,7 +219,7 @@ routed by r2 router envelope to: userx@test.ex transport: <none> locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -233,7 +238,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ... <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -261,6 +266,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = set_process_info: pppp accepting a local non-SMTP message 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 Sender: search_tidyup called >>Headers received: @@ -286,13 +293,14 @@ I Message-Id: <E10HmaY-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 mail.test.ex with local (Exim x.yz) id 10HmaY-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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -1511,6 +1519,7 @@ DSN: Flags :0 DSN: **** SPOOL_OUT - address: |sender@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |sender@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=CALLER P=local S=sss @@ -1530,6 +1539,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender= sender_local=1 ident=CALLER @@ -3364,7 +3374,7 @@ Delivery address list: sender@test.ex sender@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -17970,7 +17980,7 @@ sender@test.ex is a duplicate address: discarded >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> sender@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -17992,6 +18002,7 @@ lock file created mailbox TESTSUITE/test-mail/sender is locked writing to file TESTSUITE/test-mail/sender writing data block fd=dddd size=sss timeout=0 +flushing headers buffer writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 writing data block fd=dddd size=sss timeout=0 @@ -18009,7 +18020,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: -sender@test.ex: no retry items + sender@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing @@ -18044,9 +18055,9 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: ->sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...: no retry items -userx@test.ex: no retry items -userx@test.ex: no retry items + >sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex,sender@test.ex, ...: no retry items + userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0408 b/test/stderr/0408 index 67fe44cb5..f3d6d6b1a 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -25,6 +27,7 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 mail.test.ex with local (Exim x.yz) @@ -33,11 +36,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +59,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -68,7 +73,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -132,7 +137,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -170,7 +175,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0415 b/test/stderr/0415 index 062b67be5..f2c8612e8 100644 --- a/test/stderr/0415 +++ b/test/stderr/0415 @@ -1,30 +1,30 @@ LOG: PANIC DIE - Exim configuration error in line 20 of TESTSUITE/test-config: + Exim configuration error in line 15 of TESTSUITE/test-config: absolute value of integer "4000000M" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 20 of TESTSUITE/test-config: + Exim configuration error in line 15 of TESTSUITE/test-config: extra characters follow integer value for check_spool_space LOG: PANIC DIE - Exim configuration error in line 21 of TESTSUITE/test-config: + Exim configuration error in line 16 of TESTSUITE/test-config: integer "4000000000.123" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 21 of TESTSUITE/test-config: + Exim configuration error in line 16 of TESTSUITE/test-config: integer "4000000.123" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 23 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: absolute value of integer "999999999999999999" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 23 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: absolute value of integer "999999999K" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 23 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: absolute value of integer "999999M" is too large (overflow) LOG: PANIC DIE - Exim configuration error in line 23 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: extra characters follow integer value for finduser_retries LOG: PANIC DIE - Exim configuration error in line 23 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: integer expected for finduser_retries LOG: PANIC DIE - Exim configuration error in line 23 of TESTSUITE/test-config: + Exim configuration error in line 18 of TESTSUITE/test-config: extra characters follow integer value for finduser_retries diff --git a/test/stderr/0420 b/test/stderr/0420 index 1bf978723..045fadc9b 100644 --- a/test/stderr/0420 +++ b/test/stderr/0420 @@ -1,82 +1,2 @@ -Exim version x.yz .... -changed uid/gid: forcing real = effective - uid=uuuu gid=CALLER_GID pid=pppp -configuration file is TESTSUITE/test-config -admin user -changed uid/gid: privilege not needed - uid=EXIM_UID gid=EXIM_GID pid=pppp -originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME -sender address = CALLER@test.ex -sender_fullhost = [V4NET.0.0.0] -sender_rcvhost = [V4NET.0.0.0] -host in hosts_connection_nolog? no (option unset) -LOG: smtp_connection MAIN - SMTP connection from [V4NET.0.0.0] -host in host_lookup? no (option unset) -set_process_info: pppp handling incoming connection from [V4NET.0.0.0] -host in host_reject_connection? no (option unset) -host in sender_unqualified_hosts? no (option unset) -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 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -smtp_setup_msg entered -SMTP<< mail from:<x@y> -SMTP>> 250 OK -SMTP<< rcpt to:<x@y> -processing "accept" -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 -host in ignore_fromline_hosts? no (option unset) ->>Headers received: -search_tidyup called ->>Headers after rewriting and local additions: - -Data file written for message 10HmaX-0005vi-00 ->>Generated Received: header line -* Received: ; Tue, 2 Mar 1999 09:44:33 +0000 -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -LOG: MAIN - <= x@y H=[V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaX-0005vi-00 -smtp_setup_msg entered -SMTP<< mail from:<a@b> -SMTP>> 250 OK -SMTP<< rcpt to:<x@y> -processing "accept" -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 -host in ignore_fromline_hosts? no (option unset) ->>Headers received: - -search_tidyup called ->>Headers after rewriting and local additions: - -Data file written for message 10HmaY-0005vi-00 ->>Generated Received: header line -P Received: some text; Tue, 2 Mar 1999 09:44:33 +0000 -calling local_scan(); timeout=300 -local_scan() returned 0 NULL -LOG: MAIN - <= a@b H=[V4NET.0.0.0] P=smtp S=sss -SMTP>> 250 OK id=10HmaY-0005vi-00 -smtp_setup_msg entered -SMTP<< quit -SMTP>> 221 mail.test.ex closing connection -LOG: smtp_connection MAIN - SMTP connection from [V4NET.0.0.0] closed by QUIT -search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +******** SERVER ******** diff --git a/test/stderr/0432 b/test/stderr/0432 index 6a7aebe15..f819fb0b2 100644 --- a/test/stderr/0432 +++ b/test/stderr/0432 @@ -49,6 +49,8 @@ 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:<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" check verify = sender/callout=1s,maxwait=1s @@ -78,7 +80,7 @@ get[host|ipnode]byname[2] looked up these IP addresses: name=127.0.0.1 address=127.0.0.1 Attempting full verification using callout locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile +locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR @@ -86,28 +88,36 @@ dbfn_read: key=y callout cache: no domain record found for y dbfn_read: key=x@y callout cache: no address record found for x@y +closed hints database and lockfile interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250 OK 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<x@y> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> QUIT +cmd buf flush ddd bytes + SMTP<< 220 OK + SMTP(close)>> locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile +locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR|O_CREAT dbfn_write: key=y -wrote callout cache domain record: +wrote callout cache domain record for y: result=1 postmaster=0 random=0 dbfn_write: key=x@y -wrote positive callout cache address record +wrote positive callout cache address record for x@y +closed hints database and lockfile ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" @@ -145,6 +155,8 @@ 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:<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" check verify = sender/callout=1s,maxwait=1s @@ -174,7 +186,7 @@ get[host|ipnode]byname[2] looked up these IP addresses: name=127.0.0.1 address=127.0.0.1 Attempting full verification using callout locking TESTSUITE/spool/db/callout.lockfile -locked TESTSUITE/spool/db/callout.lockfile +locked TESTSUITE/spool/db/callout.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/callout) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/callout: flags=O_RDWR @@ -183,6 +195,7 @@ callout cache: found domain record for y dbfn_read: key=x@y callout cache: found address record for x@y callout cache: address record is positive +closed hints database and lockfile ----------- end verify ------------ sender x@y verified ok accept: condition test succeeded in ACL "mail" @@ -247,16 +260,22 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex +>>> cmd buf flush 21 bytes >>> SMTP<< 250 OK >>> 127.0.0.1 in hosts_require_auth? no (option unset) >>> SMTP>> MAIL FROM:<> +>>> cmd buf flush 14 bytes >>> SMTP<< 250 OK >>> SMTP>> RCPT TO:<a@b> +>>> cmd buf flush 15 bytes >>> SMTP<< 250 OK >>> SMTP>> QUIT ->>> wrote callout cache domain record: +>>> cmd buf flush 6 bytes +>>> SMTP<< 220 OK +>>> SMTP(close)>> +>>> wrote callout cache domain record for b: >>> result=1 postmaster=0 random=0 ->>> wrote positive callout cache address record +>>> wrote positive callout cache address record for a@b >>> ----------- end verify ------------ >>> accept: condition test succeeded in ACL "mail" >>> end of ACL "mail": ACCEPT @@ -287,7 +306,9 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP<< 220 server ready >>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex +>>> cmd buf flush 21 bytes >>> SMTP timeout +>>> SMTP(close)>> >>> ----------- end verify ------------ >>> accept: condition test deferred in ACL "mail" LOG: H=[1.2.3.4] sender verify defer for <p1@q>: Could not complete sender verify callout diff --git a/test/stderr/0442 b/test/stderr/0442 index 6db126e5a..85904224e 100644 --- a/test/stderr/0442 +++ b/test/stderr/0442 @@ -1,2 +1,2 @@ -1999-03-02 09:44:33 Exim configuration error in line 43 of TESTSUITE/test-config: +1999-03-02 09:44:33 Exim configuration error in line 38 of TESTSUITE/test-config: failed to open included configuration file /non/existent diff --git a/test/stderr/0462 b/test/stderr/0462 index 0d6d719cf..3db191cd9 100644 --- a/test/stderr/0462 +++ b/test/stderr/0462 @@ -28,9 +28,11 @@ Cutthrough cancelled by presence of postmaster verify SMTP>> RCPT TO:<postmaster@localhost> SMTP<< 550 NO SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for localhost: result=1 postmaster=2 random=0 -wrote positive callout cache address record +wrote positive callout cache address record for Ok@localhost LOG: MAIN REJECT H=[V4NET.0.0.1] U=root sender verify fail for <Ok@localhost>: response to "RCPT TO:<postmaster@localhost>" from 127.0.0.1 [127.0.0.1] was: 550 NO created log directory TESTSUITE/spool/log @@ -70,9 +72,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<NOTok@elsewhere> SMTP<< 550 NO SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for elsewhere: result=1 postmaster=0 random=0 -wrote negative callout cache address record +wrote negative callout cache address record for NOTok@elsewhere LOG: MAIN REJECT H=[V4NET.0.0.2] U=root sender verify fail for <NOTok@elsewhere>: response to "RCPT TO:<NOTok@elsewhere>" from 127.0.0.1 [127.0.0.1] was: 550 NO LOG: MAIN REJECT @@ -103,9 +107,11 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> RCPT TO:<NOTok2@elsewhere> SMTP<< 550 NO SMTP>> QUIT -wrote callout cache domain record: + SMTP<< 250 OK + SMTP(close)>> +wrote callout cache domain record for elsewhere: result=1 postmaster=0 random=0 -wrote negative callout cache address record +wrote negative callout cache address record for NOTok2@elsewhere LOG: MAIN REJECT H=[V4NET.0.0.2] U=root F=<NOTok2@elsewhere> rejected RCPT <nocheckpm@test.ex>: Sender verify failed LOG: smtp_connection MAIN diff --git a/test/stderr/0464 b/test/stderr/0464 index cf094ce21..f5615411a 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -16,6 +16,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:<abc@domain1> using ACL "rcpt" diff --git a/test/stderr/0465 b/test/stderr/0465 index f86dc46e8..92250956d 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -17,6 +17,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:<abc@domain.> LOG: smtp_syntax_error MAIN @@ -48,6 +50,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:<abc@domain.> processing "accept" @@ -69,6 +73,7 @@ T To: abc@domain. I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> 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) @@ -81,11 +86,12 @@ accept: condition test succeeded in ACL "check_data" end of ACL "check_data": ACCEPT calling local_scan(); timeout=300 local_scan() returned 0 NULL -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |abc@domain| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> U=CALLER P=local-smtp S=sss @@ -117,6 +123,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:<abc@xyz> processing "accept" @@ -138,6 +146,7 @@ T To: abc@xyz. I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> 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) diff --git a/test/stderr/0467 b/test/stderr/0467 index ec84ba9c0..8d2018ee7 100644 --- a/test/stderr/0467 +++ b/test/stderr/0467 @@ -30,6 +30,7 @@ Connecting to localhost.test.ex [127.0.0.1]:1224 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => x@srv27.test.ex R=r1 T=t1 H=localhost.test.ex [127.0.0.1]:1224 C="250 OK" LOG: MAIN diff --git a/test/stderr/0471 b/test/stderr/0471 index 1c860c21f..bb67be2d4 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -8,6 +8,8 @@ changed uid/gid: privilege not needed originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> +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 Sender: CALLER@myhost.test.ex Recipients: r1@test.ex @@ -25366,6 +25368,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> 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 (Exim x.yz) @@ -25374,11 +25377,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for r1@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |r1@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0473 b/test/stderr/0473 index 257af6c38..ed7bc5359 100644 --- a/test/stderr/0473 +++ b/test/stderr/0473 @@ -20,7 +20,8 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 250 OK SMTP>> RCPT TO:<r11@two.test.ex> SMTP timeout -wrote callout cache domain record: + SMTP(close)>> +wrote callout cache domain record for two.test.ex: result=1 postmaster=0 random=0 LOG: MAIN REJECT U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout @@ -43,6 +44,7 @@ callout cache: no address record found for r11@two.test.ex interface=NULL port=1224 Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP timeout + SMTP(close)>> LOG: MAIN REJECT U=CALLER F=<x11@two.test.ex> temporarily rejected RCPT r11@two.test.ex: Could not complete recipient verify callout LOG: smtp_connection MAIN diff --git a/test/stderr/0476 b/test/stderr/0476 index eaebb34d4..6868a902c 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -12,6 +12,8 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid ppppp) set_process_info: pppp delivering 10HmaX-0005vi-00 using t1 t1 transport entered userx@test.ex +hostlist: + 127.0.0.1:-1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) @@ -19,6 +21,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (use Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name +cmd buf flush ddd bytes SMTP<< 250-server id 250-PIPELINING 250 OK @@ -27,6 +30,7 @@ not using DSN SMTP>> MAIL FROM:<CALLER@the.local.host.name> SMTP>> RCPT TO:<userx@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 550 NO Remote host closed connection in response to pipelined DATA @@ -35,7 +39,9 @@ ok=1 send_quit=1 send_rset=1 continue_more=0 yield=0 first_address is NULL transport_check_waiting entered sequence=1 local_max=500 global_max=-1 SMTP>> RSET +cmd buf flush ddd bytes H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET + SMTP(close)>> set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for userx@test.ex: result OK Leaving t1 transport set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess) @@ -63,6 +69,8 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00 set_process_info: pppp delivering 10HmaZ-0005vi-00 using t1 t1 transport entered CALLER@the.local.host.name +hostlist: + 127.0.0.1:-1 checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name) @@ -96,6 +104,8 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid ppppp) set_process_info: pppp delivering 10HmaY-0005vi-00 using t1 t1 transport entered usery@test.ex +hostlist: + 127.0.0.1:-1 checking status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 status = unusable diff --git a/test/stderr/0479 b/test/stderr/0479 index a5e9f82cc..9386dce11 100644 --- a/test/stderr/0479 +++ b/test/stderr/0479 @@ -30,6 +30,8 @@ sender_rcvhost = [1.2.3.4] set_process_info: pppp handling incoming connection from ([1.2.3.4]) [1.2.3.4] SMTP>> 250 the.local.host.name Hello [1.2.3.4] [1.2.3.4] SMTP<< mail from:<a@b> +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:<c@d> using ACL "rcpt" diff --git a/test/stderr/0487 b/test/stderr/0487 index c8d720beb..7319b67dd 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -22,12 +22,15 @@ smtp_setup_msg entered SMTP<< ehlo x.y in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) SMTP>> 250-myhost.test.ex Hello CALLER at x.y 250-SIZE 52428800 250-8BITMIME 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 SMTP>> 250 OK SMTP<< rcpt to:<userx@test.ex> processing "accept" @@ -49,6 +52,7 @@ F From: unqualified I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> 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 (helo=x.y) @@ -58,11 +62,12 @@ P Received: from CALLER (helo=x.y) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= x@y U=CALLER P=local-esmtp S=sss @@ -83,6 +88,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=x@y sender_local=0 ident=CALLER @@ -96,7 +102,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -133,7 +139,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -173,7 +179,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/0489 b/test/stderr/0489 index 291dda645..d0caddc8e 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -4,6 +4,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil Q. Hazel" sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -14,6 +16,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: "Phil Q. Hazel" <CALLER@myhost.test.ex> 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 (Exim x.yz) @@ -22,7 +25,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -34,6 +38,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" Smith sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -44,6 +50,7 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> F From: John "Jack" Smith <CALLER@myhost.test.ex> 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 (Exim x.yz) @@ -52,7 +59,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -63,6 +71,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John "Jack" "Q." Smith sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -73,6 +83,7 @@ I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> F From: John "Jack" "Q." Smith <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D Data file written for message 10HmaZ-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -81,7 +92,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -92,6 +104,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (Jack) Q. Smith" sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -102,6 +116,7 @@ I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> F From: "John (Jack) Q. Smith" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D Data file written for message 10HmbA-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -110,7 +125,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -121,6 +137,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=John ("Jack") "Q." Smith sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -131,6 +149,7 @@ I Message-Id: <E10HmbB-0005vi-00@myhost.test.ex> F From: John ("Jack") "Q." Smith <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmbB-0005vi-00-D Data file written for message 10HmbB-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -139,7 +158,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmbB-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -150,6 +170,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="John (\"Jack\") Q. Smith" sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -160,6 +182,7 @@ I Message-Id: <E10HmbC-0005vi-00@myhost.test.ex> F From: "John (\"Jack\") Q. Smith" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmbC-0005vi-00-D Data file written for message 10HmbC-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -168,7 +191,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmbC-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -179,6 +203,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q Hazel" sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -189,6 +215,7 @@ I Message-Id: <E10HmbD-0005vi-00@myhost.test.ex> F From: "Phil \"Q Hazel" <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmbD-0005vi-00-D Data file written for message 10HmbD-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -197,7 +224,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmbD-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -208,6 +236,8 @@ trusted user admin user originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name="Phil \"Q" "X." Hazel sender address = CALLER@myhost.test.ex +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 Sender: CALLER@myhost.test.ex Recipients: X @@ -218,6 +248,7 @@ I Message-Id: <E10HmbE-0005vi-00@myhost.test.ex> F From: "Phil \"Q" "X." Hazel <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmbE-0005vi-00-D Data file written for message 10HmbE-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -226,7 +257,8 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for X@myhost.test.ex; 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.pppp +Renaming spool header file: TESTSUITE/spool//input//10HmbE-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss diff --git a/test/stderr/0495 b/test/stderr/0495 index b00cfd572..bfe9f6218 100644 --- a/test/stderr/0495 +++ b/test/stderr/0495 @@ -1,7 +1,7 @@ Delivery failed: Connection refused Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@x.y>: 550 NOTOK -Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL -Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL +Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL +Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after pipelined MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL routing file@x.y yielded a local delivery routing fail@x.y yielded a failed delivery: forcible fail message routing defer@x.y yielded a deferred delivery: forcible defer message diff --git a/test/stderr/0499 b/test/stderr/0499 index 4592f6469..2ecd699aa 100644 --- a/test/stderr/0499 +++ b/test/stderr/0499 @@ -25,7 +25,7 @@ host_find_bydns yield = HOST_FOUND_LOCAL (3); returned hosts: eximtesthost.test.ex ip4.ip4.ip4.ip4 MX=5 mxt1.test.ex in "@mx_any"? yes (matched "@mx_any") mxt1.test.ex in "+anymx"? yes (matched "+anymx") -checking "condition" +checking "condition" "${if match_domain{$domain}{+anymx}{yes}}"... DNS lookup of mxt1.test.ex (MX) using fakens DNS lookup of mxt1.test.ex (MX) succeeded DNS lookup of eximtesthost.test.ex (A) using fakens diff --git a/test/stderr/0502 b/test/stderr/0502 index 71afc025b..a3b308501 100644 --- a/test/stderr/0502 +++ b/test/stderr/0502 @@ -1 +1,3 @@ 1999-03-02 09:44:33 ACL for QUIT returned ERROR: QUIT or not-QUIT teplevel ACL may not fail ('deny' verb used incorrectly) + +******** SERVER ******** diff --git a/test/stderr/0513 b/test/stderr/0513 index 9825070c4..864b2eaa1 100644 --- a/test/stderr/0513 +++ b/test/stderr/0513 @@ -9,6 +9,7 @@ >>> a.b.c.d in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "defer" >>> check !verify = recipient diff --git a/test/stderr/0514 b/test/stderr/0514 index 22f78df7e..0c24042f8 100644 --- a/test/stderr/0514 +++ b/test/stderr/0514 @@ -6,6 +6,7 @@ admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp listing the queue +looking in TESTSUITE/spool//input reading spool file 10HmaX-0005vi-00-H user=spaced user uid=CALLER_UID gid=CALLER_GID sender="spaced user"@myhost.test.ex sender_local=1 ident=spaced user diff --git a/test/stderr/0524 b/test/stderr/0524 index 363c8dfd1..8344d34a6 100644 --- a/test/stderr/0524 +++ b/test/stderr/0524 @@ -9,6 +9,7 @@ >>> csa1.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status @@ -19,6 +20,7 @@ >>> csa2.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status @@ -37,6 +39,7 @@ LOG: H=(csa2.test.ex) [V4NET.9.8.7] rejected MAIL <>: client SMTP authorization >>> csa1.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status @@ -48,6 +51,7 @@ LOG: H=(csa1.test.ex) [V4NET.9.8.8] rejected MAIL <>: client SMTP authorization >>> csa2.test.ex in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_mail" >>> processing "accept" >>> message: CSA status is $csa_status diff --git a/test/stderr/0525 b/test/stderr/0525 index 553f8c1ce..a15308559 100644 --- a/test/stderr/0525 +++ b/test/stderr/0525 @@ -14,6 +14,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> DATA SMTP<< 354 SEND SMTP>> writing message and terminating "." + SMTP(close)>> LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP timeout after sending data block (ddd bytes written): Connection timed out LOG: MAIN diff --git a/test/stderr/0529 b/test/stderr/0529 index 49ca6dcaf..a308cc147 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -32,17 +32,17 @@ LOG: MAIN == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox) Processing retry items Succeeded addresses: -x@test.ex: no retry items + x@test.ex: no retry items Failed addresses: Deferred addresses: -TESTSUITE/test-mail/rmbox + TESTSUITE/test-mail/rmbox locking TESTSUITE/spool/db/retry.lockfile retry for T:TESTSUITE/test-mail/rmbox:x@test.ex = *@test.ex -22 0 failing_interval=ttt message_age=ttt Writing retry data for T:TESTSUITE/test-mail/rmbox:x@test.ex first failed=dddd last try=dddd next try=+900 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox) -x@test.ex: no retry items + x@test.ex: no retry items end of retry processing >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -76,11 +76,11 @@ LOG: retry_defer MAIN == TESTSUITE/test-mail/rmbox <x@test.ex> R=r1 T=t1 defer (-52): Retry time not yet reached Processing retry items Succeeded addresses: -x@test.ex: no retry items + x@test.ex: no retry items Failed addresses: Deferred addresses: -TESTSUITE/test-mail/rmbox: no retry items -x@test.ex: no retry items + TESTSUITE/test-mail/rmbox: no retry items + x@test.ex: no retry items end of retry processing LOG: queue_run MAIN End queue run: pid=pppp diff --git a/test/stderr/0537 b/test/stderr/0537 index a892e736d..c5a8b3e54 100644 --- a/test/stderr/0537 +++ b/test/stderr/0537 @@ -88,6 +88,7 @@ LOG: sender_ident=ident >>> end of ACL "connect": ACCEPT >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "mail" >>> processing "accept" >>> check acl = log diff --git a/test/stderr/0544 b/test/stderr/0544 index e8b01dfe0..edbfb61f7 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -1,50 +1,102 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: false -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: false + scanning: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=) + result: (helo=) -skipping: result is not used -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + skipping: result is not used + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + result: from CALLER + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@test.ex>) + result: (envelope-from <CALLER@test.ex>) -condition: def:received_for - result: false -expanding: + condition: def:received_for + result: false + scanning: + for $received_for}} + expanding: for $received_for - result: + result: for -skipping: result is not used -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 + skipping: result is not used + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from <CALLER@test.ex>) + id 10HmaX-0005vi-00 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log @@ -52,33 +104,43 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -expanding: $domain - result: domain1.ex +considering: $domain + expanding: $domain + result: domain1.ex LOG: MAIN == userx@domain1.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set LOG: MAIN == userx@domain2.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set -expanding: $h_list-id:$h_list-post:$h_list-subscribe: - result: -expanding: - result: -expanding: $h_precedence: - result: -expanding: (?i)bulk|list|junk - result: (?i)bulk|list|junk -expanding: $h_auto-submitted: - result: -expanding: (?i)auto-generated|auto-replied - result: (?i)auto-generated|auto-replied -condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} - result: false -expanding: no - result: no -skipping: result is not used -expanding: yes - result: yes -expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} - result: yes +considering: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} +considering: $h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} + expanding: $h_list-id:$h_list-post:$h_list-subscribe: + result: +considering: } }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} + expanding: + result: +considering: $h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} + expanding: $h_precedence: + result: +considering: (?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} + expanding: (?i)bulk|list|junk + result: (?i)bulk|list|junk +considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} + expanding: $h_auto-submitted: + result: +considering: (?i)auto-generated|auto-replied} }} {no}{yes}} + expanding: (?i)auto-generated|auto-replied + result: (?i)auto-generated|auto-replied + condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} + result: false + scanning: no}{yes}} + expanding: no + result: no + skipping: result is not used +considering: yes}} + expanding: yes + result: yes + expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} + result: yes >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... @@ -86,24 +148,32 @@ configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 -expanding: $sender_helo_name - result: ehlo.domain -expanding: +dlist - result: +dlist -expanding: $domain - result: ehlo.domain -condition: match_domain {$sender_helo_name}{+dlist} - result: true -expanding: ${if match_domain {$sender_helo_name}{+dlist}} - result: true -expanding: domain=$domain/sender_domain=$sender_address_domain - result: domain=/sender_domain=sender.domain -expanding: domain=$domain/sender_domain=$sender_address_domain - result: domain=recipient.domain/sender_domain=sender.domain -expanding: domain=$domain/sender_domain=$sender_address_domain - result: domain=recipient.domain/sender_domain=sender.domain +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${if match_domain {$sender_helo_name}{+dlist}} +considering: $sender_helo_name}{+dlist}} + expanding: $sender_helo_name + result: ehlo.domain +considering: +dlist}} + expanding: +dlist + result: +dlist +considering: $domain + expanding: $domain + result: ehlo.domain + condition: match_domain {$sender_helo_name}{+dlist} + result: true + expanding: ${if match_domain {$sender_helo_name}{+dlist}} + result: true +considering: domain=$domain/sender_domain=$sender_address_domain + expanding: domain=$domain/sender_domain=$sender_address_domain + result: domain=/sender_domain=sender.domain +considering: domain=$domain/sender_domain=$sender_address_domain + expanding: domain=$domain/sender_domain=$sender_address_domain + result: domain=recipient.domain/sender_domain=sender.domain +considering: domain=$domain/sender_domain=$sender_address_domain + expanding: domain=$domain/sender_domain=$sender_address_domain + result: domain=recipient.domain/sender_domain=sender.domain LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/0554 b/test/stderr/0554 index 5cabbf9ae..460a2c22b 100644 --- a/test/stderr/0554 +++ b/test/stderr/0554 @@ -26,7 +26,7 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -x@y + x@y locking TESTSUITE/spool/db/retry.lockfile retry for R:x@y:<CALLER@myhost.test.ex> = * 0 0 failing_interval=ttt message_age=ttt @@ -78,7 +78,7 @@ LOG: MAIN => x@y R=r1 T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" Processing retry items Succeeded addresses: -x@y + x@y locking TESTSUITE/spool/db/retry.lockfile deleted retry information for R:x@y:<CALLER@myhost.test.ex> deleted retry information for R:x@y diff --git a/test/stderr/0557 b/test/stderr/0557 index 8e5906ca8..19fd8c29f 100644 --- a/test/stderr/0557 +++ b/test/stderr/0557 @@ -1,2 +1,2 @@ LOG: MAIN - error in r1 router: no host(s) specified for domain * + error in r1 router: no host(s) specified for domain test.ex diff --git a/test/stderr/0574 b/test/stderr/0574 new file mode 100644 index 000000000..0d94be4e8 --- /dev/null +++ b/test/stderr/0574 @@ -0,0 +1,3 @@ +cat: TESTSUITE/spool/log/serverdebuglog_1: No such file or directory + +******** SERVER ******** diff --git a/test/stderr/0575 b/test/stderr/0575 new file mode 100644 index 000000000..86620a896 --- /dev/null +++ b/test/stderr/0575 @@ -0,0 +1,63 @@ +Exim version x.yz .... +changed uid/gid: forcing real = effective + uid=uuuu gid=CALLER_GID pid=pppp +configuration file is TESTSUITE/test-config +admin user +changed uid/gid: privilege not needed + uid=EXIM_UID gid=EXIM_GID pid=pppp +originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME +sender address = CALLER@test.ex +sender_fullhost = [V4NET.0.0.0] +sender_rcvhost = [V4NET.0.0.0] +host in hosts_connection_nolog? no (option unset) +LOG: smtp_connection MAIN + SMTP connection from [V4NET.0.0.0] +host in host_lookup? no (option unset) +set_process_info: pppp handling incoming connection from [V4NET.0.0.0] +host in host_reject_connection? no (option unset) +host in sender_unqualified_hosts? no (option unset) +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 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +smtp_setup_msg entered +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 +SMTP>> 250 OK +SMTP<< rcpt to:<x@y> +processing "accept" +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 +host in ignore_fromline_hosts? no (option unset) +>>Headers received: + +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] + by mail.test.ex with smtp (Exim x.yz) + (envelope-from <x@y>) + 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 +LOG: MAIN + <= x@y H=[V4NET.0.0.0] P=smtp S=sss +SMTP>> 250 OK id=10HmaX-0005vi-00 +smtp_setup_msg entered +SMTP<< quit +SMTP>> 221 mail.test.ex closing connection +LOG: smtp_connection MAIN + SMTP connection from [V4NET.0.0.0] closed by QUIT +search_tidyup called +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2008 b/test/stderr/2008 index cfd510557..dd4abbe40 100644 --- a/test/stderr/2008 +++ b/test/stderr/2008 @@ -27,6 +27,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> QUIT + SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN @@ -60,6 +61,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT + SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN @@ -90,6 +92,7 @@ Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:1225 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbB-0005vi-00 SMTP>> QUIT + SMTP(close)>> LOG: MAIN => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" LOG: MAIN diff --git a/test/stderr/2013 b/test/stderr/2013 index 58d52d2f5..be80161c2 100644 --- a/test/stderr/2013 +++ b/test/stderr/2013 @@ -6,6 +6,7 @@ LOG: queue_run MAIN Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -13,8 +14,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-STARTTLS 250 HELP SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -23,17 +26,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userx@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP + SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN @@ -43,23 +49,28 @@ configuration file is TESTSUITE/test-config trusted user admin user SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250 HELP SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss - SMTP>> RCPT TO:<userx@test.ex> + SMTP>> RCPT TO:<usery@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> LOG: MAIN - => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" + => usery@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no DN="C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN Completed >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/2020 b/test/stderr/2020 index e16a6800b..045fadc9b 100644 --- a/test/stderr/2020 +++ b/test/stderr/2020 @@ -1,8 +1,2 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option ******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option diff --git a/test/stderr/2108 b/test/stderr/2108 index df110cc5a..1a9bb89c2 100644 --- a/test/stderr/2108 +++ b/test/stderr/2108 @@ -31,6 +31,7 @@ LOG: MAIN SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> QUIT + SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN @@ -68,6 +69,7 @@ LOG: MAIN SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT + SMTP(close)>> LOG: MAIN => CALLER@test.ex R=client T=send_to_server1 H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN @@ -102,6 +104,7 @@ LOG: MAIN SMTP>> writing message and terminating "." SMTP<< 250 OK id=10HmbB-0005vi-00 SMTP>> QUIT + SMTP(close)>> LOG: MAIN => abcd@test.ex R=client T=send_to_server2 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbB-0005vi-00" LOG: MAIN diff --git a/test/stderr/2113 b/test/stderr/2113 index 3efab7e3a..2db86789b 100644 --- a/test/stderr/2113 +++ b/test/stderr/2113 @@ -6,6 +6,7 @@ LOG: queue_run MAIN Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -13,8 +14,10 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected 250-STARTTLS 250 HELP SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -23,17 +26,20 @@ Connecting to 127.0.0.1 [127.0.0.1]:1225 ... connected SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userx@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmaZ-0005vi-00 SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP + SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmaZ-0005vi-00" LOG: MAIN @@ -43,8 +49,10 @@ configuration file is TESTSUITE/test-config trusted user admin user SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1] 250-SIZE 52428800 250-8BITMIME @@ -53,11 +61,14 @@ admin user SMTP>> MAIL FROM:<CALLER@myhost.test.ex> SIZE=ssss SMTP>> RCPT TO:<userx@test.ex> SMTP>> DATA +cmd buf flush ddd bytes SMTP<< 250 OK SMTP<< 250 Accepted SMTP<< 354 Enter message, ending with "." on a line by itself SMTP<< 250 OK id=10HmbA-0005vi-00 SMTP>> QUIT +cmd buf flush ddd bytes + SMTP(close)>> LOG: MAIN => userx@test.ex R=client T=send_to_server H=127.0.0.1 [127.0.0.1]* X=TLSv1:AES256-SHA:256 CV=no DN="/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock" C="250 OK id=10HmbA-0005vi-00" LOG: MAIN diff --git a/test/stderr/2120 b/test/stderr/2120 index e16a6800b..045fadc9b 100644 --- a/test/stderr/2120 +++ b/test/stderr/2120 @@ -1,8 +1,2 @@ -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option ******** SERVER ******** -1999-03-02 09:44:33 Warning: No server certificate defined; TLS connections will fail. - Suggested action: either install a certificate or change tls_advertise_hosts option diff --git a/test/stderr/2202 b/test/stderr/2202 index dbca98bdd..45b039a59 100644 --- a/test/stderr/2202 +++ b/test/stderr/2202 @@ -23,6 +23,8 @@ 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:<xx@cioce.test.again.dns> +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:<a@b> using ACL "rcpt" diff --git a/test/stderr/2600 b/test/stderr/2600 index cc1864aa2..4e9974733 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -132,6 +132,8 @@ 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:<a@b> +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:<c@d> using ACL "check_recipient" @@ -226,6 +228,8 @@ 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:<a@b> +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:<c@d> using ACL "check_recipient" @@ -295,6 +299,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@myhost.test.ex> +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 Sender: CALLER@myhost.test.ex Recipients: userx @@ -309,6 +315,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@myhost.test.ex> 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 (Exim x.yz) @@ -317,11 +324,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@myhost.test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@myhost.test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local S=sss @@ -339,6 +347,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@myhost.test.ex sender_local=1 ident=CALLER @@ -352,7 +361,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@myhost.test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -399,7 +408,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@myhost.test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -446,7 +455,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userx@myhost.test.ex: no retry items + userx@myhost.test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/3000 b/test/stderr/3000 index 6859068af..6aea66ac5 100644 --- a/test/stderr/3000 +++ b/test/stderr/3000 @@ -2,34 +2,45 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user -expanding: foo - result: foo -expanding: arg1 - result: arg1 +considering: ${perl{foo}{arg1}} +considering: foo}{arg1}} + expanding: foo + result: foo +considering: arg1}} + expanding: arg1 + result: arg1 Starting Perl interpreter -expanding: ${perl{foo}{arg1}} - result: Subroutine foo called with args: arg1 -expanding: foo_undef - result: foo_undef + expanding: ${perl{foo}{arg1}} + result: Subroutine foo called with args: arg1 +considering: ${perl{foo_undef}} +considering: foo_undef}} + expanding: foo_undef + result: foo_undef failed to expand: ${perl{foo_undef}} error message: Perl subroutine "foo_undef" returned undef to force failure failure was forced -expanding: debug_write - result: debug_write -expanding: debug from Perl\n - result: debug from Perl +considering: ${perl{debug_write}{debug from Perl\n}} +considering: debug_write}{debug from Perl\n}} + expanding: debug_write + result: debug_write +considering: debug from Perl\n}} + expanding: debug from Perl\n + result: debug from Perl debug from Perl -expanding: ${perl{debug_write}{debug from Perl\n}} - result: Wrote debug -expanding: log_write - result: log_write -expanding: log from Perl - result: log from Perl + expanding: ${perl{debug_write}{debug from Perl\n}} + result: Wrote debug +considering: ${perl{log_write}{log from Perl}} +considering: log_write}{log from Perl}} + expanding: log_write + result: log_write +considering: log from Perl}} + expanding: log from Perl + result: log from Perl LOG: MAIN log from Perl -expanding: ${perl{log_write}{log from Perl}} - result: Wrote log + expanding: ${perl{log_write}{log from Perl}} + result: Wrote log >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from CALLER @@ -48,6 +59,7 @@ LOG: smtp_connection MAIN >>> x.y.z in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_rcpt" >>> processing "accept" LOG: this is a warning at TESTSUITE/aux-fixed/3000.pl line 25. diff --git a/test/stderr/3201 b/test/stderr/3201 index 096248f45..10fa6f937 100644 --- a/test/stderr/3201 +++ b/test/stderr/3201 @@ -36,7 +36,7 @@ host in "testdb;fail"? no (end of list) deny: condition test failed in ACL "connect1" end of ACL "connect1": implicit DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=[10.0.0.1] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -78,7 +78,7 @@ host in "net-testdb;fail"? no (end of list) deny: condition test failed in ACL "connect2" end of ACL "connect2": implicit DENY SMTP>> 550 Administrative prohibition -LOG: MAIN REJECT +LOG: connection_reject MAIN REJECT H=[10.0.0.2] rejected connection in "connect" ACL search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/3208 b/test/stderr/3208 index 1eba14049..d25ef58ad 100644 --- a/test/stderr/3208 +++ b/test/stderr/3208 @@ -9,6 +9,7 @@ >>> remote.host in helo_lookup_domains? no (end of list) >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> test.ex in percent_hack_domains? no (matched "!test.ex") >>> using ACL "check_recipient" >>> processing "accept" diff --git a/test/stderr/3400 b/test/stderr/3400 index 6eda31374..541d08d5a 100644 --- a/test/stderr/3400 +++ b/test/stderr/3400 @@ -87,6 +87,7 @@ LOG: H=[10.0.0.2] Warning: accepted ETRN #abcd >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1"? yes (matched "10.0.0.1") >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in smtp_accept_max_nonmail_hosts? yes (matched "*") >>> using ACL "check_vrfy" >>> processing "deny" @@ -290,6 +291,7 @@ LOG: H=(test.host) [10.0.0.1] Warning: accepted ETRN #abcd >>> host in "10.0.0.4"? no (end of list) >>> host in "10.0.0.3 : 10.0.0.4"? yes (matched "10.0.0.3") >>> host in auth_advertise_hosts? yes (matched "+auth_relay_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "warn" >>> check hosts = 10.0.0.5 @@ -385,6 +387,7 @@ LOG: H=(test.host) [10.0.0.3] F=<junk@jink.jonk.test.ex> rejected RCPT <userx@cu >>> host in "10.0.0.1"? no (end of list) >>> host in "10.0.0.4"? yes (matched "10.0.0.4") >>> host in auth_advertise_hosts? no (matched "!+relay_hosts") +>>> host in chunking_advertise_hosts? no (end of list) Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -437,6 +440,7 @@ host in "10.0.0.1"? no (end of list) host in "10.0.0.4"? no (end of list) host in "10.0.0.3 : 10.0.0.4"? no (end of list) host in auth_advertise_hosts? yes (matched "10.0.0.5") +host in chunking_advertise_hosts? no (end of list) SMTP>> 250-myhost.test.ex Hello CALLER at testing.testing [10.0.0.5] 250-SIZE 52428800 250-8BITMIME diff --git a/test/stderr/3404 b/test/stderr/3404 index 8d35b6730..361f9fd82 100644 --- a/test/stderr/3404 +++ b/test/stderr/3404 @@ -18,6 +18,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK" LOG: MAIN @@ -42,6 +43,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=plain C="250 OK" LOG: MAIN @@ -70,6 +72,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected SMTP>> writing message and terminating "." SMTP<< 250 OK SMTP>> QUIT + SMTP(close)>> LOG: MAIN => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] A=login C="250 OK" LOG: MAIN diff --git a/test/stderr/3408 b/test/stderr/3408 index 8c6fb8b25..3f53a120a 100644 --- a/test/stderr/3408 +++ b/test/stderr/3408 @@ -10,6 +10,7 @@ >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> using ACL "check_recipient" >>> processing "accept" >>> check hosts = : @@ -55,6 +56,7 @@ LOG: 10HmaX-0005vi-00 <= postmaster@exim.test.ex H=(exim.test.ex) [V4NET.11.12.1 >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> plain authenticator server_condition: >>> $auth1 = >>> $auth2 = userx diff --git a/test/stderr/3410 b/test/stderr/3410 index 2a6c3d5aa..36fbdb425 100644 --- a/test/stderr/3410 +++ b/test/stderr/3410 @@ -17,6 +17,7 @@ LOG: H=[5.6.9.1] F=<x@y> rejected RCPT <x@y>: You must authenticate >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> auth1 authenticator server_condition: >>> $auth1 = >>> $auth2 = userx @@ -50,6 +51,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y> >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> auth1 authenticator server_condition: >>> $auth1 = >>> $auth2 = userx @@ -76,6 +78,7 @@ LOG: H=[5.6.10.1] F=<x@y> rejected RCPT <x@y> >>> host in dsn_advertise_hosts? no (option unset) >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in auth_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) >>> auth2 authenticator server_condition: >>> $auth1 = userx >>> $auth2 = secret diff --git a/test/stderr/3500 b/test/stderr/3500 index 61225ae7d..9f4a5e087 100644 --- a/test/stderr/3500 +++ b/test/stderr/3500 @@ -12,6 +12,7 @@ >>> host in "10.0.0.1 : 10.0.0.5"? no (end of list) >>> host in "10.0.0.4"? yes (matched "10.0.0.4") >>> host in auth_advertise_hosts? no (matched "!+relay_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -25,6 +26,7 @@ >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.1") >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3="" >>> CRAM-MD5: user name = tim >>> challenge = <1896.697170952@postoffice.reston.mci.net> @@ -76,6 +78,7 @@ LOG: 10HmaY-0005vi-00 <= userx@some.domain H=(test.host) [10.0.0.1] P=esmtpa A=c >>> host in pipelining_advertise_hosts? yes (matched "*") >>> host in "10.0.0.1 : 10.0.0.5"? yes (matched "10.0.0.5") >>> host in auth_advertise_hosts? yes (matched "+auth_hosts") +>>> host in chunking_advertise_hosts? no (end of list) >>> +++CRAM-MD5 $auth1="tim" $auth2="" $auth3="" >>> CRAM-MD5: user name = tim >>> challenge = <1896.697170952@postoffice.reston.mci.net> diff --git a/test/stderr/4504 b/test/stderr/4504 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/4504 @@ -0,0 +1,2 @@ + +******** SERVER ******** diff --git a/test/stderr/4509 b/test/stderr/4509 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/4509 @@ -0,0 +1,2 @@ + +******** SERVER ******** diff --git a/test/stderr/5004 b/test/stderr/5004 index 501488711..ad5c9b331 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -13,6 +13,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -27,6 +29,7 @@ I Message-Id: <E10HmaX-0005vi-00@mail.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 mail.test.ex with local (Exim x.yz) @@ -35,11 +38,12 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -59,6 +63,7 @@ seeking password data for user "CALLER": using cached result getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -72,7 +77,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -110,7 +115,7 @@ routed by r1 router envelope to: userx@test.ex transport: <none> locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -129,7 +134,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> TESTSUITE/test-mail <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -168,9 +173,9 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -TESTSUITE/test-mail: no retry items -userx@test.ex: no retry items -userx@test.ex: no retry items + TESTSUITE/test-mail: no retry items + userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/5005 b/test/stderr/5005 index f55aa9b1f..8b28b7055 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: nofile@test.ex @@ -25,6 +27,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 (Exim x.yz) @@ -33,11 +36,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for nofile@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |nofile@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +59,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -68,7 +73,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: nofile@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -105,7 +110,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> nofile@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -162,7 +167,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -nofile@test.ex: no retry items + nofile@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing @@ -195,6 +200,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -209,6 +216,7 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 (Exim x.yz) @@ -217,11 +225,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -238,6 +247,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaY-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaY-0005vi-00-D reading spool file 10HmaY-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -251,7 +261,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -287,7 +297,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -346,7 +356,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 Processing retry items Succeeded addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing @@ -379,6 +389,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -393,6 +405,7 @@ I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmaZ-0005vi-00-D Data file written for message 10HmaZ-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -401,11 +414,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -422,6 +436,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaZ-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaZ-0005vi-00-D reading spool file 10HmaZ-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -435,7 +450,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -471,7 +486,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -527,9 +542,9 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR @@ -543,13 +558,15 @@ Writing retry data for T:userx@test.ex first failed=dddd last try=dddd next try=+86400 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) dbfn_write: key=T:userx@test.ex +closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaZ-0005vi-00-H Size of headers = sss end delivery of 10HmaZ-0005vi-00 search_tidyup called @@ -570,6 +587,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -584,6 +603,7 @@ I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +Data file name: TESTSUITE/spool//input//10HmbA-0005vi-00-D Data file written for message 10HmbA-0005vi-00 >>Generated Received: header line P Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -592,11 +612,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -613,6 +634,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmbA-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmbA-0005vi-00-D reading spool file 10HmbA-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -626,7 +648,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY @@ -639,6 +661,7 @@ dbfn_read: key=R:userx@test.ex:<CALLER@test.ex> no domain retry record no address retry record userx@test.ex: queued for routing +closed hints database and lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing userx@test.ex --------> r1 router <-------- @@ -665,13 +688,14 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDONLY dbfn_read: key=T:userx@test.ex retry record exists: age=ttt (max 1w) time to retry = tttt expired = 0 +closed hints database and lockfile search_tidyup called changed uid/gid: local delivery to userx <userx@test.ex> transport=t1 uid=CALLER_UID gid=CALLER_GID pid=pppp @@ -711,9 +735,9 @@ Processing retry items Succeeded addresses: Failed addresses: Deferred addresses: -userx@test.ex + userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR @@ -727,13 +751,15 @@ Writing retry data for T:userx@test.ex first failed=dddd last try=dddd next try=+86400 expired=0 errno=-22 more_errno=dd mailbox is full (MTA-imposed quota exceeded while writing to tmp/MAILDIR.myhost.test.ex) dbfn_write: key=T:userx@test.ex +closed hints database and lockfile end of retry processing delivery deferred: update_spool=1 header_rewritten=0 -Writing spool header file +Writing spool header file: TESTSUITE/spool//input//hdr.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmbA-0005vi-00-H Size of headers = sss end delivery of 10HmbA-0005vi-00 search_tidyup called diff --git a/test/stderr/5006 b/test/stderr/5006 index 15e322819..dce0d0050 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -11,6 +11,8 @@ getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@test.ex set_process_info: pppp accepting a local non-SMTP message from <CALLER@test.ex> +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 Sender: CALLER@test.ex Recipients: userx@test.ex @@ -25,6 +27,7 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> F From: CALLER_NAME <CALLER@test.ex> 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 (Exim x.yz) @@ -33,11 +36,12 @@ P Received: from CALLER by myhost.test.ex with local (Exim x.yz) for userx@test.ex; 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.pppp DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 DSN: **** SPOOL_OUT - address: |userx@test.ex| errorsto: |NULL| orcpt: |NULL| dsn_flags: 0 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss @@ -55,6 +59,7 @@ seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID set_process_info: pppp delivering specified messages set_process_info: pppp delivering 10HmaX-0005vi-00 +Trying spool file TESTSUITE/spool//input//10HmaX-0005vi-00-D reading spool file 10HmaX-0005vi-00-H user=CALLER uid=CALLER_UID gid=CALLER_GID sender=CALLER@test.ex sender_local=1 ident=CALLER @@ -68,7 +73,7 @@ DSN: set orcpt: NULL flags: 0 Delivery address list: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim @@ -105,7 +110,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- locking TESTSUITE/spool/db/retry.lockfile -locked TESTSUITE/spool/db/retry.lockfile +locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN(TESTSUITE/spool/db/retry) returned from EXIM_DBOPEN no retry data available @@ -160,7 +165,7 @@ changed uid/gid: post-delivery tidying set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 Processing retry items Succeeded addresses: -userx@test.ex: no retry items + userx@test.ex: no retry items Failed addresses: Deferred addresses: end of retry processing diff --git a/test/stderr/5204 b/test/stderr/5204 index b6f852338..e1ed340c0 100644 --- a/test/stderr/5204 +++ b/test/stderr/5204 @@ -269,6 +269,7 @@ host in helo_accept_junk_hosts? no (option unset) some.name in helo_lookup_domains? no (end of list) host in dsn_advertise_hosts? no (option unset) host in pipelining_advertise_hosts? yes (matched "*") +host in chunking_advertise_hosts? no (end of list) processing "accept" check verify = recipient >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> diff --git a/test/stderr/5401 b/test/stderr/5401 deleted file mode 100644 index 1b42441d9..000000000 --- a/test/stderr/5401 +++ /dev/null @@ -1,43 +0,0 @@ -Exim version x.yz .... -configuration file is TESTSUITE/test-config -admin user -LOG: smtp_connection MAIN - SMTP connection from CALLER -using ACL "acl_rcpt" -processing "accept" -check control = cutthrough_delivery -check verify = recipient ------------ end verify ------------ -accept: condition test succeeded in ACL "acl_rcpt" -end of ACL "acl_rcpt": ACCEPT ------------ start cutthrough setup ------------ -Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected - SMTP<< 220 ESMTP - SMTP>> EHLO myhost.test.ex - SMTP<< 250 OK - SMTP>> MAIL FROM:<CALLER@myhost.test.ex> - SMTP<< 250 Sender OK - SMTP>> RCPT TO:<userx@domain.com> - SMTP<< 250 Recipient OK ------------ end cutthrough setup ------------ -processing "accept" -accept: condition test succeeded in inline ACL -end of inline ACL: ACCEPT - SMTP>> DATA - SMTP<< 354 Send data ------------ start cutthrough headers send ----------- ------------ done cutthrough headers send ------------ - SMTP>> . - SMTP<< 250 OK -LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" -created log directory TESTSUITE/spool/log - SMTP>> QUIT ------------ cutthrough shutdown (delivered) ------------ -LOG: MAIN - <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss -LOG: MAIN - Completed -LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> diff --git a/test/stderr/5403 b/test/stderr/5403 new file mode 100644 index 000000000..8d6f97c9a --- /dev/null +++ b/test/stderr/5403 @@ -0,0 +1,95 @@ +>>> host in hosts_connection_nolog? no (option unset) +>>> host in host_lookup? no (option unset) +>>> host in host_reject_connection? no (option unset) +>>> host in sender_unqualified_hosts? no (option unset) +>>> 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) +>>> myhost.test.ex in helo_lookup_domains? yes (matched "@") +>>> looking up host name for 1.2.3.4 +LOG: no host name found for IP address 1.2.3.4 +>>> host in dsn_advertise_hosts? no (option unset) +>>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) +>>> using ACL "ar" +>>> processing "warn" +>>> check control = cutthrough_delivery +>>> check logwrite = rcpt for $local_part@$domain +>>> = rcpt for plain@domain.com +LOG: rcpt for plain@domain.com +>>> warn: condition test succeeded in ACL "ar" +>>> processing "warn" +>>> check condition = ${if eq {verify}{$local_part}} +>>> = +>>> warn: condition test failed in ACL "ar" +>>> processing "accept" +>>> accept: condition test succeeded in ACL "ar" +>>> end of ACL "ar": ACCEPT +LOG: 10HmaX-0005vi-00 <= CALLER@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for plain@domain.com +>>> host in hosts_connection_nolog? no (option unset) +>>> host in host_lookup? no (option unset) +>>> host in host_reject_connection? no (option unset) +>>> host in sender_unqualified_hosts? no (option unset) +>>> 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) +>>> myhost.test.ex in helo_lookup_domains? yes (matched "@") +>>> looking up host name for 1.2.3.4 +LOG: no host name found for IP address 1.2.3.4 +>>> host in dsn_advertise_hosts? no (option unset) +>>> host in pipelining_advertise_hosts? yes (matched "*") +>>> host in chunking_advertise_hosts? no (end of list) +>>> using ACL "ar" +>>> processing "warn" +>>> check control = cutthrough_delivery +>>> check logwrite = rcpt for $local_part@$domain +>>> = rcpt for verify@domain.com +LOG: rcpt for verify@domain.com +>>> warn: condition test succeeded in ACL "ar" +>>> processing "warn" +>>> check condition = ${if eq {verify}{$local_part}} +>>> = true +>>> check verify = recipient/callout=use_sender +>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +>>> routing verify@domain.com +>>> domain.com in "localhost.test.ex : localhost4.test.ex : thishost.test.ex"? no (end of list) +>>> domain.com in "test.ex : *.test.ex"? no (end of list) +>>> domain.com in "! +local_domains"? yes (end of list) +>>> calling all router +>>> domain.com in "special.com"? no (end of list) +>>> domain.com in "*"? yes (matched "*") +>>> local host found for non-MX address +>>> fully qualified name = 127.0.0.1 +MUNGED: ::1 will be omitted in what follows +>>> get[host|ipnode]byname[2] looked up these IP addresses: +>>> name=127.0.0.1 address=127.0.0.1 +>>> routed by all router +>>> Attempting full verification using callout +>>> callout cache: disabled by no_cache +>>> interface=ip4.ip4.ip4.ip4 port=1224 +>>> Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected +>>> SMTP<< 220 server ready +>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset) +>>> SMTP>> EHLO myhost.test.ex +>>> cmd buf flush 21 bytes +>>> SMTP<< 250 OK +>>> 127.0.0.1 in hosts_require_auth? no (option unset) +>>> SMTP>> MAIL FROM:<sender@myhost.test.ex> +>>> cmd buf flush 35 bytes +>>> SMTP<< 250 OK +>>> SMTP>> RCPT TO:<verify@domain.com> +>>> cmd buf flush 29 bytes +>>> SMTP<< 250 OK +>>> holding verify callout open for cutthrough delivery +>>> ----------- end verify ------------ +>>> warn: condition test succeeded in ACL "ar" +>>> processing "accept" +>>> accept: condition test succeeded in ACL "ar" +>>> end of ACL "ar": ACCEPT +>>> SMTP>> QUIT +>>> SMTP<< 220 OK +>>> SMTP(close)>> +>>> ----------- cutthrough shutdown (host-checking mode) ------------ +LOG: 10HmaY-0005vi-00 <= sender@myhost.test.ex H=(myhost.test.ex) [1.2.3.4] P=esmtp S=sss for verify@domain.com diff --git a/test/stderr/5410 b/test/stderr/5410 index 0f655c416..cb1b31b72 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -4,32 +4,40 @@ admin user in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") -expanding: SERVER - result: SERVER -expanding: server - result: server -condition: eq {SERVER}{server} - result: false -expanding: queue - result: queue -skipping: result is not used -expanding: cutthrough - result: cutthrough -expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} - result: cutthrough +considering: ${if eq {SERVER}{server}{queue}{cutthrough}} +considering: SERVER}{server}{queue}{cutthrough}} + expanding: SERVER + result: SERVER +considering: server}{queue}{cutthrough}} + expanding: server + result: server + condition: eq {SERVER}{server} + result: false + scanning: queue}{cutthrough}} + expanding: queue + result: queue + skipping: result is not used +considering: cutthrough}} + expanding: cutthrough + result: cutthrough + expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} + result: cutthrough using ACL "cutthrough" processing "accept" check control = cutthrough_delivery check verify = recipient domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: userx +considering: $local_part + expanding: $local_part + result: userx domain.com in "*"? yes (matched "*") ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" @@ -37,56 +45,71 @@ end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: userx +considering: $local_part + expanding: $local_part + result: userx domain.com in "*"? yes (matched "*") Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected -expanding: $primary_hostname - result: myhost.test.ex +considering: $primary_hostname + expanding: $primary_hostname + result: myhost.test.ex SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP -expanding: $address_data - result: userx -expanding: usery - result: usery -condition: eq {$address_data}{usery} - result: false -expanding: * - result: * -skipping: result is not used -expanding: : - result: : -expanding: ${if eq {$address_data}{usery}{*}{:}} - result: : +considering: ${if eq {$address_data}{usery}{*}{:}} +considering: $address_data}{usery}{*}{:}} + expanding: $address_data + result: userx +considering: usery}{*}{:}} + expanding: usery + result: usery + condition: eq {$address_data}{usery} + result: false + scanning: *}{:}} + expanding: * + result: * + skipping: result is not used +considering: :}} + expanding: : + result: : + expanding: ${if eq {$address_data}{usery}{*}{:}} + result: : 127.0.0.1 in hosts_avoid_tls? no (end of list) -expanding: $address_data - result: userx -expanding: userz - result: userz -condition: eq {$address_data}{userz} - result: false -expanding: * - result: * -skipping: result is not used -expanding: : - result: : -expanding: ${if eq {$address_data}{userz}{*}{:}} - result: : +considering: ${if eq {$address_data}{userz}{*}{:}} +considering: $address_data}{userz}{*}{:}} + expanding: $address_data + result: userx +considering: userz}{*}{:}} + expanding: userz + result: userz + condition: eq {$address_data}{userz} + result: false + scanning: *}{:}} + expanding: * + result: * + skipping: result is not used +considering: :}} + expanding: : + result: : + expanding: ${if eq {$address_data}{userz}{*}{:}} + result: : 127.0.0.1 in hosts_verify_avoid_tls? no (end of list) SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead 127.0.0.1 in hosts_require_ocsp? no (option unset) 127.0.0.1 in hosts_request_ocsp? yes (matched "*") 127.0.0.1 in tls_verify_hosts? no (option unset) 127.0.0.1 in tls_try_verify_hosts? no (end of list) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -94,65 +117,124 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250 HELP 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<userx@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: true -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: true +considering: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=myhost.test.ex) + result: (helo=myhost.test.ex) -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER (helo=myhost.test.ex) + result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local-esmtp -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local-esmtp + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@myhost.test.ex>) + result: (envelope-from <CALLER@myhost.test.ex>) -condition: def:received_for - result: true -expanding: + condition: def:received_for + result: true +considering: + for $received_for}} + expanding: for $received_for - result: + result: + for userx@domain.com + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmaX-0005vi-00 for userx@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaX-0005vi-00 + SMTP<< 250 OK id=10HmaY-0005vi-00 LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaX-0005vi-00" + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss @@ -167,32 +249,40 @@ admin user in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") -expanding: SERVER - result: SERVER -expanding: server - result: server -condition: eq {SERVER}{server} - result: false -expanding: queue - result: queue -skipping: result is not used -expanding: cutthrough - result: cutthrough -expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} - result: cutthrough +considering: ${if eq {SERVER}{server}{queue}{cutthrough}} +considering: SERVER}{server}{queue}{cutthrough}} + expanding: SERVER + result: SERVER +considering: server}{queue}{cutthrough}} + expanding: server + result: server + condition: eq {SERVER}{server} + result: false + scanning: queue}{cutthrough}} + expanding: queue + result: queue + skipping: result is not used +considering: cutthrough}} + expanding: cutthrough + result: cutthrough + expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} + result: cutthrough using ACL "cutthrough" processing "accept" check control = cutthrough_delivery check verify = recipient domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" @@ -200,96 +290,163 @@ end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected -expanding: $primary_hostname - result: myhost.test.ex +considering: $primary_hostname + expanding: $primary_hostname + result: myhost.test.ex SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP -expanding: $address_data - result: usery -expanding: usery - result: usery -condition: eq {$address_data}{usery} - result: true -expanding: * - result: * -expanding: : - result: : -skipping: result is not used -expanding: ${if eq {$address_data}{usery}{*}{:}} - result: * +considering: ${if eq {$address_data}{usery}{*}{:}} +considering: $address_data}{usery}{*}{:}} + expanding: $address_data + result: usery +considering: usery}{*}{:}} + expanding: usery + result: usery + condition: eq {$address_data}{usery} + result: true +considering: *}{:}} + expanding: * + result: * + scanning: :}} + expanding: : + result: : + skipping: result is not used + expanding: ${if eq {$address_data}{usery}{*}{:}} + result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: true -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: true +considering: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=myhost.test.ex) + result: (helo=myhost.test.ex) -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER (helo=myhost.test.ex) + result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local-esmtp -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local-esmtp + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@myhost.test.ex>) + result: (envelope-from <CALLER@myhost.test.ex>) -condition: def:received_for - result: true -expanding: + condition: def:received_for + result: true +considering: + for $received_for}} + expanding: for $received_for - result: + result: + for usery@domain.com + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmaZ-0005vi-00 for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP<< 250 OK id=10HmbA-0005vi-00 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss @@ -304,32 +461,40 @@ admin user in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") -expanding: SERVER - result: SERVER -expanding: server - result: server -condition: eq {SERVER}{server} - result: false -expanding: queue - result: queue -skipping: result is not used -expanding: cutthrough - result: cutthrough -expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} - result: cutthrough +considering: ${if eq {SERVER}{server}{queue}{cutthrough}} +considering: SERVER}{server}{queue}{cutthrough}} + expanding: SERVER + result: SERVER +considering: server}{queue}{cutthrough}} + expanding: server + result: server + condition: eq {SERVER}{server} + result: false + scanning: queue}{cutthrough}} + expanding: queue + result: queue + skipping: result is not used +considering: cutthrough}} + expanding: cutthrough + result: cutthrough + expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} + result: cutthrough using ACL "cutthrough" processing "accept" check control = cutthrough_delivery check verify = recipient domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" @@ -337,96 +502,163 @@ end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected -expanding: $primary_hostname - result: myhost.test.ex +considering: $primary_hostname + expanding: $primary_hostname + result: myhost.test.ex SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP -expanding: $address_data - result: usery -expanding: usery - result: usery -condition: eq {$address_data}{usery} - result: true -expanding: * - result: * -expanding: : - result: : -skipping: result is not used -expanding: ${if eq {$address_data}{usery}{*}{:}} - result: * +considering: ${if eq {$address_data}{usery}{*}{:}} +considering: $address_data}{usery}{*}{:}} + expanding: $address_data + result: usery +considering: usery}{*}{:}} + expanding: usery + result: usery + condition: eq {$address_data}{usery} + result: true +considering: *}{:}} + expanding: * + result: * + scanning: :}} + expanding: : + result: : + skipping: result is not used + expanding: ${if eq {$address_data}{usery}{*}{:}} + result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: true -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: true +considering: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=myhost.test.ex) + result: (helo=myhost.test.ex) -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER (helo=myhost.test.ex) + result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local-esmtp -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local-esmtp + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@myhost.test.ex>) + result: (envelope-from <CALLER@myhost.test.ex>) -condition: def:received_for - result: true -expanding: + condition: def:received_for + result: true +considering: + for $received_for}} + expanding: for $received_for - result: + result: + for usery@domain.com + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbB-0005vi-00 for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP<< 250 OK id=10HmbC-0005vi-00 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/stderr/5420 b/test/stderr/5420 index 7f9332965..8ccf0fd6c 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -4,32 +4,40 @@ admin user in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") -expanding: SERVER - result: SERVER -expanding: server - result: server -condition: eq {SERVER}{server} - result: false -expanding: queue - result: queue -skipping: result is not used -expanding: cutthrough - result: cutthrough -expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} - result: cutthrough +considering: ${if eq {SERVER}{server}{queue}{cutthrough}} +considering: SERVER}{server}{queue}{cutthrough}} + expanding: SERVER + result: SERVER +considering: server}{queue}{cutthrough}} + expanding: server + result: server + condition: eq {SERVER}{server} + result: false + scanning: queue}{cutthrough}} + expanding: queue + result: queue + skipping: result is not used +considering: cutthrough}} + expanding: cutthrough + result: cutthrough + expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} + result: cutthrough using ACL "cutthrough" processing "accept" check control = cutthrough_delivery check verify = recipient domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: userx +considering: $local_part + expanding: $local_part + result: userx domain.com in "*"? yes (matched "*") ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" @@ -37,55 +45,70 @@ end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: userx +considering: $local_part + expanding: $local_part + result: userx domain.com in "*"? yes (matched "*") Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected -expanding: $primary_hostname - result: myhost.test.ex +considering: $primary_hostname + expanding: $primary_hostname + result: myhost.test.ex SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP -expanding: $address_data - result: userx -expanding: usery - result: usery -condition: eq {$address_data}{usery} - result: false -expanding: * - result: * -skipping: result is not used -expanding: : - result: : -expanding: ${if eq {$address_data}{usery}{*}{:}} - result: : +considering: ${if eq {$address_data}{usery}{*}{:}} +considering: $address_data}{usery}{*}{:}} + expanding: $address_data + result: userx +considering: usery}{*}{:}} + expanding: usery + result: usery + condition: eq {$address_data}{usery} + result: false + scanning: *}{:}} + expanding: * + result: * + skipping: result is not used +considering: :}} + expanding: : + result: : + expanding: ${if eq {$address_data}{usery}{*}{:}} + result: : 127.0.0.1 in hosts_avoid_tls? no (end of list) -expanding: $address_data - result: userx -expanding: userz - result: userz -condition: eq {$address_data}{userz} - result: false -expanding: * - result: * -skipping: result is not used -expanding: : - result: : -expanding: ${if eq {$address_data}{userz}{*}{:}} - result: : +considering: ${if eq {$address_data}{userz}{*}{:}} +considering: $address_data}{userz}{*}{:}} + expanding: $address_data + result: userx +considering: userz}{*}{:}} + expanding: userz + result: userz + condition: eq {$address_data}{userz} + result: false + scanning: *}{:}} + expanding: * + result: * + skipping: result is not used +considering: :}} + expanding: : + result: : + expanding: ${if eq {$address_data}{userz}{*}{:}} + result: : 127.0.0.1 in hosts_verify_avoid_tls? no (end of list) SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead 127.0.0.1 in tls_verify_hosts? no (option unset) 127.0.0.1 in tls_try_verify_hosts? yes (matched "*") 127.0.0.1 in tls_verify_cert_hostnames? yes (matched "*") SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -93,65 +116,124 @@ expanding: ${if eq {$address_data}{userz}{*}{:}} 250 HELP 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<userx@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: true -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: true +considering: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=myhost.test.ex) + result: (helo=myhost.test.ex) -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER (helo=myhost.test.ex) + result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local-esmtp -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local-esmtp + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@myhost.test.ex>) + result: (envelope-from <CALLER@myhost.test.ex>) -condition: def:received_for - result: true -expanding: + condition: def:received_for + result: true +considering: + for $received_for}} + expanding: for $received_for - result: + result: + for userx@domain.com + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmaX-0005vi-00 for userx@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaX-0005vi-00 + SMTP<< 250 OK id=10HmaY-0005vi-00 LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaX-0005vi-00" + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss @@ -166,32 +248,40 @@ admin user in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") -expanding: SERVER - result: SERVER -expanding: server - result: server -condition: eq {SERVER}{server} - result: false -expanding: queue - result: queue -skipping: result is not used -expanding: cutthrough - result: cutthrough -expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} - result: cutthrough +considering: ${if eq {SERVER}{server}{queue}{cutthrough}} +considering: SERVER}{server}{queue}{cutthrough}} + expanding: SERVER + result: SERVER +considering: server}{queue}{cutthrough}} + expanding: server + result: server + condition: eq {SERVER}{server} + result: false + scanning: queue}{cutthrough}} + expanding: queue + result: queue + skipping: result is not used +considering: cutthrough}} + expanding: cutthrough + result: cutthrough + expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} + result: cutthrough using ACL "cutthrough" processing "accept" check control = cutthrough_delivery check verify = recipient domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" @@ -199,96 +289,163 @@ end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected -expanding: $primary_hostname - result: myhost.test.ex +considering: $primary_hostname + expanding: $primary_hostname + result: myhost.test.ex SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP -expanding: $address_data - result: usery -expanding: usery - result: usery -condition: eq {$address_data}{usery} - result: true -expanding: * - result: * -expanding: : - result: : -skipping: result is not used -expanding: ${if eq {$address_data}{usery}{*}{:}} - result: * +considering: ${if eq {$address_data}{usery}{*}{:}} +considering: $address_data}{usery}{*}{:}} + expanding: $address_data + result: usery +considering: usery}{*}{:}} + expanding: usery + result: usery + condition: eq {$address_data}{usery} + result: true +considering: *}{:}} + expanding: * + result: * + scanning: :}} + expanding: : + result: : + skipping: result is not used + expanding: ${if eq {$address_data}{usery}{*}{:}} + result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: true -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: true +considering: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=myhost.test.ex) + result: (helo=myhost.test.ex) -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER (helo=myhost.test.ex) + result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local-esmtp -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local-esmtp + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@myhost.test.ex>) + result: (envelope-from <CALLER@myhost.test.ex>) -condition: def:received_for - result: true -expanding: + condition: def:received_for + result: true +considering: + for $received_for}} + expanding: for $received_for - result: + result: + for usery@domain.com + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmaZ-0005vi-00 for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP<< 250 OK id=10HmbA-0005vi-00 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss @@ -303,32 +460,40 @@ admin user in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER -expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full - result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full + result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") -expanding: SERVER - result: SERVER -expanding: server - result: server -condition: eq {SERVER}{server} - result: false -expanding: queue - result: queue -skipping: result is not used -expanding: cutthrough - result: cutthrough -expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} - result: cutthrough +considering: ${if eq {SERVER}{server}{queue}{cutthrough}} +considering: SERVER}{server}{queue}{cutthrough}} + expanding: SERVER + result: SERVER +considering: server}{queue}{cutthrough}} + expanding: server + result: server + condition: eq {SERVER}{server} + result: false + scanning: queue}{cutthrough}} + expanding: queue + result: queue + skipping: result is not used +considering: cutthrough}} + expanding: cutthrough + result: cutthrough + expanding: ${if eq {SERVER}{server}{queue}{cutthrough}} + result: cutthrough using ACL "cutthrough" processing "accept" check control = cutthrough_delivery check verify = recipient domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" @@ -336,96 +501,163 @@ end of ACL "cutthrough": ACCEPT ----------- start cutthrough setup ------------ domain.com in "test.ex : *.test.ex"? no (end of list) domain.com in "! +local_domains"? yes (end of list) -expanding: $local_part - result: usery +considering: $local_part + expanding: $local_part + result: usery domain.com in "*"? yes (matched "*") Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected -expanding: $primary_hostname - result: myhost.test.ex +considering: $primary_hostname + expanding: $primary_hostname + result: myhost.test.ex SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP -expanding: $address_data - result: usery -expanding: usery - result: usery -condition: eq {$address_data}{usery} - result: true -expanding: * - result: * -expanding: : - result: : -skipping: result is not used -expanding: ${if eq {$address_data}{usery}{*}{:}} - result: * +considering: ${if eq {$address_data}{usery}{*}{:}} +considering: $address_data}{usery}{*}{:}} + expanding: $address_data + result: usery +considering: usery}{*}{:}} + expanding: usery + result: usery + condition: eq {$address_data}{usery} + result: true +considering: *}{:}} + expanding: * + result: * + scanning: :}} + expanding: : + result: : + skipping: result is not used + expanding: ${if eq {$address_data}{usery}{*}{:}} + result: * 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM:<CALLER@myhost.test.ex> +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO:<usery@domain.com> +cmd buf flush ddd bytes SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL end of inline ACL: ACCEPT SMTP>> DATA SMTP<< 354 Enter message, ending with "." on a line by itself -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 -condition: def:sender_rcvhost - result: false -expanding: from $sender_rcvhost +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_rcvhost + result: false + scanning: from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: from $sender_rcvhost - result: from + result: from -skipping: result is not used -condition: def:sender_ident - result: true -expanding: $sender_ident - result: CALLER -expanding: from ${quote_local_part:$sender_ident} - result: from CALLER -condition: def:sender_helo_name - result: true -expanding: (helo=$sender_helo_name) + skipping: result is not used +considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + condition: def:sender_ident + result: true +considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} +considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: $sender_ident + result: CALLER + expanding: from ${quote_local_part:$sender_ident} + result: from CALLER + condition: def:sender_helo_name + result: true +considering: (helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (helo=$sender_helo_name) - result: (helo=myhost.test.ex) + result: (helo=myhost.test.ex) -expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) }} - result: from CALLER (helo=myhost.test.ex) + result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -expanding: with $received_protocol - result: with local-esmtp -condition: def:sender_address - result: true -expanding: (envelope-from <$sender_address>) + condition: def:received_protocol + result: true +considering: with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: with $received_protocol + result: with local-esmtp + condition: def:sender_address + result: true +considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + expanding: (envelope-from <$sender_address>) - result: (envelope-from <CALLER@myhost.test.ex>) + result: (envelope-from <CALLER@myhost.test.ex>) -condition: def:received_for - result: true -expanding: + condition: def:received_for + result: true +considering: + for $received_for}} + expanding: for $received_for - result: + result: + for usery@domain.com + expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost + }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (Exim $version_number) + ${if def:sender_address {(envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} + result: Received: from CALLER (helo=myhost.test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from <CALLER@myhost.test.ex>) + id 10HmbB-0005vi-00 for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ -expanding: ${tod_full} - result: Tue, 2 Mar 1999 09:44:33 +0000 +considering: ${tod_full} + expanding: ${tod_full} + result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP<< 250 OK id=10HmbC-0005vi-00 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss diff --git a/test/stderr/5610 b/test/stderr/5610 new file mode 100644 index 000000000..045fadc9b --- /dev/null +++ b/test/stderr/5610 @@ -0,0 +1,2 @@ + +******** SERVER ******** diff --git a/test/stderr/5840 b/test/stderr/5840 index 91e80e8ea..97fdca69d 100644 --- a/test/stderr/5840 +++ b/test/stderr/5840 @@ -1,3 +1,6 @@ +### TLSA (3 1 1) +### TLSA (3 1 2) +### Recipient callout >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -9,14 +12,14 @@ >>> processing "accept" >>> check verify = recipient/callout >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ->>> routing CALLER@dane256ee.test.ex +>>> routing rcptuser@dane256ee.test.ex >>> calling client router >>> dane256ee.test.ex in "*"? yes (matched "*") >>> local host found for non-MX address >>> routed by client router >>> Attempting full verification using callout >>> callout cache: no domain record found for dane256ee.test.ex ->>> callout cache: no address record found for CALLER@dane256ee.test.ex +>>> callout cache: no address record found for rcptuser@dane256ee.test.ex >>> interface=NULL port=1225 >>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:1225 ... connected MUNGED: ::1 will be omitted in what follows @@ -26,6 +29,7 @@ MUNGED: ::1 will be omitted in what follows >>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 >>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset) >>> SMTP>> EHLO myhost.test.ex +>>> cmd buf flush 21 bytes >>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] >>> 250-SIZE 52428800 >>> 250-8BITMIME @@ -35,11 +39,13 @@ MUNGED: ::1 will be omitted in what follows >>> ip4.ip4.ip4.ip4 in hosts_avoid_tls? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_verify_avoid_tls? no (option unset) >>> SMTP>> STARTTLS +>>> cmd buf flush 10 bytes >>> SMTP<< 220 TLS go ahead >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_require_ocsp? no (option unset) >>> ip4.ip4.ip4.ip4 in hosts_request_ocsp? no (end of list) >>> SMTP>> EHLO myhost.test.ex +>>> cmd buf flush 21 bytes >>> SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] >>> 250-SIZE 52428800 >>> 250-8BITMIME @@ -47,16 +53,36 @@ MUNGED: ::1 will be omitted in what follows >>> 250 HELP >>> ip4.ip4.ip4.ip4 in hosts_require_auth? no (option unset) >>> SMTP>> MAIL FROM:<> +>>> cmd buf flush 14 bytes >>> SMTP<< 250 OK ->>> SMTP>> RCPT TO:<CALLER@dane256ee.test.ex> +>>> SMTP>> RCPT TO:<rcptuser@dane256ee.test.ex> +>>> cmd buf flush 38 bytes >>> SMTP<< 250 Accepted >>> SMTP>> QUIT ->>> wrote callout cache domain record: +>>> cmd buf flush 6 bytes +>>> SMTP<< 221 myhost.test.ex closing connection +>>> SMTP(close)>> +>>> wrote callout cache domain record for dane256ee.test.ex: >>> result=1 postmaster=0 random=0 ->>> wrote positive callout cache address record +>>> wrote positive callout cache address record for rcptuser@dane256ee.test.ex >>> ----------- end verify ------------ >>> accept: condition test succeeded in inline ACL >>> end of inline ACL: ACCEPT LOG: unexpected disconnection while reading SMTP command from [127.0.0.1] +### TLSA (2 0 1) +### A server with a nonverifying cert and no TLSA +### A server with a verifying cert and no TLSA +### A server with two MXs for which both TLSA lookups return defer +### A server lacking a TLSA, required +### A server lacking a TLSA, requested only ******** SERVER ******** +### TLSA (3 1 1) +### TLSA (3 1 2) +### Recipient callout +### TLSA (2 0 1) +### A server with a nonverifying cert and no TLSA +### A server with a verifying cert and no TLSA +### A server with two MXs for which both TLSA lookups return defer +### A server lacking a TLSA, required +### A server lacking a TLSA, requested only diff --git a/test/stderr/5900 b/test/stderr/5900 new file mode 100644 index 000000000..70058d78e --- /dev/null +++ b/test/stderr/5900 @@ -0,0 +1 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (2): No such file or directory: scan transport accessing directory: TESTSUITE/test-mail/subdir failed with error: No such file or directory diff --git a/test/stderr/5901 b/test/stderr/5901 new file mode 100644 index 000000000..111bae495 --- /dev/null +++ b/test/stderr/5901 @@ -0,0 +1 @@ +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=scan T=scan defer (-1): scan transport directory: test-mail/subdir is not absolute |