X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/b01dd148c3a5f3a70817b08e41ad21aeee1d8f28..de1294ea67d5567e3599101fa8ce50b8fd3e4dd6:/test/stderr/0022 diff --git a/test/stderr/0022 b/test/stderr/0022 index 08de42bea..c558b4226 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -25,23 +25,27 @@ 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: +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: using ACL "warn_empty" processing "warn" -warn: condition test succeeded +warn: condition test succeeded in ACL "warn_empty" processing "accept" -accept: condition test succeeded +accept: condition test succeeded in ACL "warn_empty" +end of ACL "warn_empty": 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//10HmbF-0005vi-00-D Data file written for message 10HmbF-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -60,7 +64,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -88,25 +92,30 @@ 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: +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: using ACL "warn_log" processing "warn" -warn: condition test succeeded +l_message: warn log message +warn: condition test succeeded in ACL "warn_log" LOG: MAIN H=[V4NET.9.8.7] Warning: warn log message processing "accept" -accept: condition test succeeded +accept: condition test succeeded in ACL "warn_log" +end of ACL "warn_log": 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//10HmbG-0005vi-00-D Data file written for message 10HmbG-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -125,7 +134,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp @@ -153,23 +162,28 @@ 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: +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: using ACL "warn_user" processing "warn" -warn: condition test succeeded + message: warn user message +warn: condition test succeeded in ACL "warn_user" processing "accept" -accept: condition test succeeded +accept: condition test succeeded in ACL "warn_user" +end of ACL "warn_user": 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//10HmbH-0005vi-00-D Data file written for message 10HmbH-0005vi-00 >>Generated Received: header line P Received: from [V4NET.9.8.7] @@ -191,7 +205,7 @@ SMTP>> 221 myhost.test.ex closing connection LOG: smtp_connection MAIN SMTP connection from [V4NET.9.8.7] closed by QUIT search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] >>> host in host_lookup? no (option unset) @@ -203,14 +217,19 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> host in helo_accept_junk_hosts? no (option unset) >>> using ACL "defer" >>> processing "defer" ->>> defer: condition test succeeded +>>> message: forcibly deferred +>>> defer: condition test succeeded in ACL "defer" +>>> end of ACL "defer": DEFER LOG: H=[V4NET.9.8.7] F= temporarily rejected RCPT : forcibly deferred >>> using ACL "accept" >>> processing "accept" ->>> accept: condition test succeeded +>>> accept: condition test succeeded in ACL "accept" +>>> end of ACL "accept": ACCEPT >>> using ACL "drop" >>> processing "drop" ->>> drop: condition test succeeded +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> end of ACL "drop": DROP LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL >>> host in hosts_connection_nolog? no (end of list) @@ -226,7 +245,8 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> processing "defer" >>> check senders = : >>> in ":"? yes (matched "") ->>> defer: condition test succeeded +>>> defer: condition test succeeded in ACL "defer_senders" +>>> end of ACL "defer_senders": DEFER LOG: H=[V4NET.9.8.7] F=<> temporarily rejected RCPT LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT >>> host in hosts_connection_nolog? no (end of list) @@ -243,15 +263,17 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> check delay = 1s >>> delay modifier requests 1-second delay >>> delay skipped in -bh checking mode ->>> accept: condition test succeeded +>>> accept: condition test succeeded in ACL "delay_accept" +>>> end of ACL "delay_accept": ACCEPT >>> using ACL "delay_warn" >>> processing "warn" >>> check delay = 1s >>> delay modifier requests 1-second delay >>> delay skipped in -bh checking mode ->>> warn: condition test succeeded +>>> warn: condition test succeeded in ACL "delay_warn" >>> processing "accept" ->>> accept: condition test succeeded +>>> accept: condition test succeeded in ACL "delay_warn" +>>> end of ACL "delay_warn": ACCEPT LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT >>> host in hosts_connection_nolog? no (end of list) LOG: SMTP connection from [V4NET.9.8.7] @@ -266,26 +288,34 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> processing "deny" >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts") ->>> deny: condition test succeeded +>>> message: host data >$host_data< +>>> deny: condition test succeeded in ACL "host_check" +>>> end of ACL "host_check": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check" >>> processing "deny" >>> check hosts = net-lsearch;TESTSUITE/aux-var/0022.hosts >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts") ->>> deny: condition test succeeded +>>> message: host data >$host_data< +>>> deny: condition test succeeded in ACL "host_check" +>>> end of ACL "host_check": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check2" >>> processing "deny" +>>> message: host data >$host_data< >>> check hosts = +some_hosts >>> host in "net-lsearch;TESTSUITE/aux-var/0022.hosts"? yes (matched "net-lsearch;TESTSUITE/aux-var/0022.hosts") >>> host in "+some_hosts"? yes (matched "+some_hosts") ->>> deny: condition test succeeded +>>> deny: condition test succeeded in ACL "host_check2" +>>> end of ACL "host_check2": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< >>> using ACL "host_check2" >>> processing "deny" +>>> message: host data >$host_data< >>> check hosts = +some_hosts >>> host in "+some_hosts"? yes (matched "+some_hosts" - cached) ->>> deny: condition test succeeded +>>> deny: condition test succeeded in ACL "host_check2" +>>> end of ACL "host_check2": DENY LOG: H=[V4NET.9.8.7] F= rejected RCPT : host data >A host-specific message< LOG: SMTP connection from [V4NET.9.8.7] closed by QUIT LOG: smtp_connection MAIN @@ -328,10 +358,12 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> using ACL "nested_drop" >>> processing "accept" >>> check acl = drop ->>> using ACL "drop" ->>> processing "drop" ->>> drop: condition test succeeded ->>> accept: condition test yielded "drop" +>>> using ACL "drop" +>>> processing "drop" +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> end of ACL "drop": DROP +>>> accept: condition test yielded "drop" in ACL "nested_drop" >>> accept: endpass encountered - denying access LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL @@ -347,10 +379,13 @@ LOG: SMTP connection from [V4NET.9.8.7] >>> using ACL "nested_drop_require" >>> processing "require" >>> check acl = drop ->>> using ACL "drop" ->>> processing "drop" ->>> drop: condition test succeeded ->>> require: condition test yielded "drop" +>>> using ACL "drop" +>>> processing "drop" +>>> message: forcibly dropped +>>> drop: condition test succeeded in ACL "drop" +>>> end of ACL "drop": DROP +>>> require: condition test yielded "drop" in ACL "nested_drop_require" +>>> end of ACL "nested_drop_require": not OK LOG: H=[V4NET.9.8.7] F= rejected RCPT : forcibly dropped LOG: SMTP connection from [V4NET.9.8.7] closed by DROP in ACL