X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9ee30919f807678b0bc9f675dcfa73225b486574..90bd3832bc0ff090ac5e37dfc66b30cabb9cfc1a:/test/stderr/5410 diff --git a/test/stderr/5410 b/test/stderr/5410 index c5db2f1e8..5d94a6b18 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -4,9 +4,16 @@ environment after trimming: adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user +try option gecos_pattern +try option gecos_name +try option unknown_login +try option smtp_active_hostname in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER +try option message_size_limit +try option acl_smtp_connect +try option smtp_banner ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full ├──────value: myhost.test.ex ├considering: ESMTP Exim $version_number $tod_full @@ -19,7 +26,14 @@ LOG: smtp_connection MAIN ├──────value: Tue, 2 Mar 1999 09:44:33 +0000 ├──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 + list element: * + in limits_advertise_hosts? yes (matched "*") +try option spf_smtp_comment_template +try option acl_smtp_helo in dsn_advertise_hosts? no (option unset) +try option acl_smtp_etrn +try option acl_smtp_vrfy +try option acl_smtp_expn in pipelining_advertise_hosts? list element: * in pipelining_advertise_hosts? yes (matched "*") @@ -27,6 +41,8 @@ LOG: smtp_connection MAIN in chunking_advertise_hosts? no (end of list) list element: * in tls_advertise_hosts? yes (matched "*") +try option acl_smtp_mail +try option acl_smtp_rcpt ╭considering: ${if eq {SERVER}{server}{queue}{cutthrough}} ╭considering: SERVER}{server}{queue}{cutthrough}} ├───────text: SERVER @@ -75,6 +91,7 @@ domain.com in "! +local_domains"? yes (end of list) domain.com in "*"? list element: * domain.com in "*"? yes (matched "*") +try option unseen ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" end of ACL "cutthrough": ACCEPT @@ -97,9 +114,13 @@ domain.com in "! +local_domains"? yes (end of list) domain.com in "*"? list element: * domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? +try option unseen +try option interface +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp +127.0.0.1 in hosts_try_fastopen? list element: connected +try option helo_data ╭considering: $primary_hostname ├──────value: myhost.test.ex ├──expanding: $primary_hostname @@ -110,10 +131,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP +try option host_name_extract ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ├──────value: 127.0.0.1 @@ -225,6 +248,7 @@ cmd buf flush ddd bytes cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250 HELP @@ -232,6 +256,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) +try option authenticated_sender SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes @@ -241,14 +266,18 @@ sync_responses expect rcpt for userx@domain.com SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ +try option acl_smtp_predata processing "accept" (TESTSUITE/test-config 57) 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 +try option message_id_header_domain +try option message_id_header_text ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +try option received_header_text ╭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 }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -562,7 +591,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaX-0005vi-00 + ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -593,18 +622,21 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 for userx@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ +try option acl_smtp_dkim +try option acl_smtp_mime +try option acl_smtp_data ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaY-0005vi-00 + SMTP<< 250 OK id=10HmaY-000000005vi-0000 LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-0005vi-00" + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLS1.x:ke-RSA-AES256-SHAnnn:xxx CV=no C="250 OK id=10HmaY-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -614,6 +646,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: MAIN Completed +try option acl_smtp_quit LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -623,9 +656,16 @@ environment after trimming: adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user +try option gecos_pattern +try option gecos_name +try option unknown_login +try option smtp_active_hostname in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER +try option message_size_limit +try option acl_smtp_connect +try option smtp_banner ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full ├──────value: myhost.test.ex ├considering: ESMTP Exim $version_number $tod_full @@ -638,7 +678,14 @@ LOG: smtp_connection MAIN ├──────value: Tue, 2 Mar 1999 09:44:33 +0000 ├──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 + list element: * + in limits_advertise_hosts? yes (matched "*") +try option spf_smtp_comment_template +try option acl_smtp_helo in dsn_advertise_hosts? no (option unset) +try option acl_smtp_etrn +try option acl_smtp_vrfy +try option acl_smtp_expn in pipelining_advertise_hosts? list element: * in pipelining_advertise_hosts? yes (matched "*") @@ -646,6 +693,8 @@ LOG: smtp_connection MAIN in chunking_advertise_hosts? no (end of list) list element: * in tls_advertise_hosts? yes (matched "*") +try option acl_smtp_mail +try option acl_smtp_rcpt ╭considering: ${if eq {SERVER}{server}{queue}{cutthrough}} ╭considering: SERVER}{server}{queue}{cutthrough}} ├───────text: SERVER @@ -694,6 +743,7 @@ domain.com in "! +local_domains"? yes (end of list) domain.com in "*"? list element: * domain.com in "*"? yes (matched "*") +try option unseen ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" end of ACL "cutthrough": ACCEPT @@ -716,9 +766,13 @@ domain.com in "! +local_domains"? yes (end of list) domain.com in "*"? list element: * domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? +try option unseen +try option interface +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp +127.0.0.1 in hosts_try_fastopen? list element: connected +try option helo_data ╭considering: $primary_hostname ├──────value: myhost.test.ex ├──expanding: $primary_hostname @@ -729,10 +783,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP +try option host_name_extract ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ├──────value: 127.0.0.1 @@ -802,6 +858,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) +try option authenticated_sender SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes @@ -811,14 +868,18 @@ sync_responses expect rcpt for usery@domain.com SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ +try option acl_smtp_predata processing "accept" (TESTSUITE/test-config 57) 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 +try option message_id_header_domain +try option message_id_header_text ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +try option received_header_text ╭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 }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -1132,7 +1193,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmaZ-0005vi-00 + ├──────value: 10HmaZ-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -1163,18 +1224,21 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaZ-0005vi-00 + id 10HmaZ-000000005vi-0000 for usery@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ +try option acl_smtp_dkim +try option acl_smtp_mime +try option acl_smtp_data ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbA-0005vi-00 + SMTP<< 250 OK id=10HmbA-000000005vi-0000 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -1184,6 +1248,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: MAIN Completed +try option acl_smtp_quit LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> @@ -1193,9 +1258,16 @@ environment after trimming: adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user +try option gecos_pattern +try option gecos_name +try option unknown_login +try option smtp_active_hostname in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from CALLER +try option message_size_limit +try option acl_smtp_connect +try option smtp_banner ╭considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full ├──────value: myhost.test.ex ├considering: ESMTP Exim $version_number $tod_full @@ -1208,7 +1280,14 @@ LOG: smtp_connection MAIN ├──────value: Tue, 2 Mar 1999 09:44:33 +0000 ├──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 + list element: * + in limits_advertise_hosts? yes (matched "*") +try option spf_smtp_comment_template +try option acl_smtp_helo in dsn_advertise_hosts? no (option unset) +try option acl_smtp_etrn +try option acl_smtp_vrfy +try option acl_smtp_expn in pipelining_advertise_hosts? list element: * in pipelining_advertise_hosts? yes (matched "*") @@ -1216,6 +1295,8 @@ LOG: smtp_connection MAIN in chunking_advertise_hosts? no (end of list) list element: * in tls_advertise_hosts? yes (matched "*") +try option acl_smtp_mail +try option acl_smtp_rcpt ╭considering: ${if eq {SERVER}{server}{queue}{cutthrough}} ╭considering: SERVER}{server}{queue}{cutthrough}} ├───────text: SERVER @@ -1264,6 +1345,7 @@ domain.com in "! +local_domains"? yes (end of list) domain.com in "*"? list element: * domain.com in "*"? yes (matched "*") +try option unseen ----------- end verify ------------ accept: condition test succeeded in ACL "cutthrough" end of ACL "cutthrough": ACCEPT @@ -1286,9 +1368,13 @@ domain.com in "! +local_domains"? yes (end of list) domain.com in "*"? list element: * domain.com in "*"? yes (matched "*") -Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in hosts_try_fastopen? +try option unseen +try option interface +Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp +127.0.0.1 in hosts_try_fastopen? list element: connected +try option helo_data ╭considering: $primary_hostname ├──────value: myhost.test.ex ├──expanding: $primary_hostname @@ -1299,10 +1385,12 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... 127.0.0.1 in cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 + 250-LIMITS MAILMAX=1000 RCPTMAX=50000 250-8BITMIME 250-PIPELINING 250-STARTTLS 250 HELP +try option host_name_extract ╭considering: ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ╭considering: $host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}} ├──────value: 127.0.0.1 @@ -1372,6 +1460,7 @@ cmd buf flush ddd bytes using PIPELINING not using DSN 127.0.0.1 in hosts_require_auth? no (option unset) +try option authenticated_sender SMTP|> MAIL FROM: SMTP>> RCPT TO: cmd buf flush ddd bytes @@ -1381,14 +1470,18 @@ sync_responses expect rcpt for usery@domain.com SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ +try option acl_smtp_predata processing "accept" (TESTSUITE/test-config 57) 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 +try option message_id_header_domain +try option message_id_header_text ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 +try option received_header_text ╭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 }}${if def:tls_in_ver { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std @@ -1702,7 +1795,7 @@ end of inline ACL: ACCEPT ├───────text: id ├considering: $message_exim_id${if def:received_for { for $received_for}} - ├──────value: 10HmbB-0005vi-00 + ├──────value: 10HmbB-000000005vi-0000 ├considering: ${if def:received_for { for $received_for}} ├──condition: def:received_for @@ -1733,18 +1826,21 @@ end of inline ACL: ACCEPT ╰─────result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbB-0005vi-00 + id 10HmbB-000000005vi-0000 for usery@domain.com ╰──(tainted) ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ +try option acl_smtp_dkim +try option acl_smtp_mime +try option acl_smtp_data ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbC-0005vi-00 + SMTP<< 250 OK id=10HmbC-000000005vi-0000 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-000000005vi-0000" SMTP>> QUIT SMTP<< 221 myhost.test.ex closing connection SMTP(close)>> @@ -1754,6 +1850,7 @@ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: MAIN Completed +try option acl_smtp_quit LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT >>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>