X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..f9609304cd7ffe553e3da325287973a0b2a4446c:/test/stderr/0092?ds=sidebyside diff --git a/test/stderr/0092 b/test/stderr/0092 index 491a30ee4..96616f098 100644 --- a/test/stderr/0092 +++ b/test/stderr/0092 @@ -6,9 +6,7 @@ >>> 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) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: -LOG: SMTP command timeout on connection from [V4NET.0.0.1] +LOG: SMTP command timeout on connection from [V4NET.0.0.1] D=qqs >>> host in hosts_connection_nolog? no (option unset) >>> host in host_lookup? no (option unset) >>> host in host_reject_connection? no (option unset) @@ -17,8 +15,6 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> 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) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -47,7 +43,7 @@ LOG: SMTP command timeout on connection from [V4NET.0.0.1] >>> test.ex in "+local_domains"? yes (matched "+local_domains") >>> accept: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": ACCEPT -LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F= +LOG: SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F= D=qqs Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 @@ -58,13 +54,18 @@ configuration file is TESTSUITE/test-config admin user changed uid/gid: privilege not needed uid=EXIM_UID gid=EXIM_GID pid=p1234 +try option gecos_pattern +try option gecos_name +try option unknown_login originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_NAME sender address = CALLER@myhost.test.ex +try option smtp_active_hostname sender_fullhost = [V4NET.0.0.1] sender_rcvhost = [V4NET.0.0.1] host in hosts_connection_nolog? no (option unset) LOG: smtp_connection MAIN SMTP connection from [V4NET.0.0.1] +try option message_size_limit host in host_lookup? no (option unset) set_process_info: pppp handling incoming connection from [V4NET.0.0.1] ╭considering: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s @@ -74,6 +75,7 @@ set_process_info: pppp handling incoming connection from [V4NET.0.0.1] ├──expanding: V4NET.0.0.1 ╰─────result: V4NET.0.0.1 ╭considering: $sender_host_address} {2} {30}}s + ├──────value: V4NET.0.0.1 ├considering: } {2} {30}}s ├──expanding: $sender_host_address ╰─────result: V4NET.0.0.1 @@ -101,17 +103,20 @@ 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) +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 ├───────text: ESMTP Exim ├considering: $version_number $tod_full + ├──────value: x.yz ├considering: $tod_full ├───────text: ├considering: $tod_full + ├──────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 -host in pipelining_connect_advertise_hosts? - list element: SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 smtp_setup_msg entered SMTP<< helo test @@ -122,12 +127,15 @@ test in helo_lookup_domains? no (end of list) sender_fullhost = (test) [V4NET.0.0.1] sender_rcvhost = [V4NET.0.0.1] (helo=test) set_process_info: pppp handling incoming connection from (test) [V4NET.0.0.1] +try option acl_smtp_helo SMTP>> 250 myhost.test.ex Hello test [V4NET.0.0.1] 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 +try option acl_smtp_mail SMTP>> 250 OK SMTP<< rcpt to:userx@test.ex +try option acl_smtp_rcpt using ACL "check_recipient" processing "accept" (TESTSUITE/test-config 27) check hosts = : @@ -158,10 +166,12 @@ accept: condition test succeeded in ACL "check_recipient" end of ACL "check_recipient": ACCEPT SMTP>> 250 Accepted SMTP<< data +try option acl_smtp_predata SMTP>> 354 Enter message, ending with "." on a line by itself search_tidyup called LOG: lost_incoming_connection MAIN - SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F= + SMTP data timeout (message abandoned) on connection from (test) [V4NET.0.0.1] F= D=qqs +try option acl_smtp_notquit SMTP>> 421 myhost.test.ex SMTP incoming data timeout - closing connection. search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=1 >>>>>>>>>>>>>>>> @@ -175,8 +185,6 @@ exim: timed out while reading - message abandoned >>> 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) ->>> host in pipelining_connect_advertise_hosts? ->>> list element: >>> test in helo_lookup_domains? >>> list element: @ >>> list element: @[] @@ -213,7 +221,7 @@ exim: timed out while reading - message abandoned >>> deny: condition test succeeded in ACL "check_recipient" >>> end of ACL "check_recipient": DENY LOG: H=(test) [V4NET.0.0.1] F= rejected RCPT verify@test.ex: Unrouteable address -LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1] +LOG: SMTP command timeout on connection from (test) [V4NET.0.0.1] D=qqs An error was detected while processing a file of BSMTP input. The error message was: