X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3b447cdfe3f9f53546d09d7e01d1e0ecf0d6696c..340e5f5781abb5388c41fa326d6e1cabf7ba96ff:/test/stderr/0021 diff --git a/test/stderr/0021 b/test/stderr/0021 index dabace74a..c330bc449 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -13,30 +13,31 @@ 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) using ACL "connect" -processing "deny" (TESTSUITE/test-config 50) +processing "deny" (TESTSUITE/test-config 52) check hosts = : 10.9.8.7 host in ": 10.9.8.7"? no (end of list) deny: condition test failed in ACL "connect" -processing "drop" (TESTSUITE/test-config 51) +processing "drop" (TESTSUITE/test-config 53) l_message: forcibly dropped check hosts = 10.9.8.9 host in "10.9.8.9"? no (end of list) drop: condition test failed in ACL "connect" -processing "accept" (TESTSUITE/test-config 53) +processing "accept" (TESTSUITE/test-config 55) check logwrite = $sender_host_address accepted by connect ACL = 10.9.8.8 accepted by connect ACL LOG: MAIN 10.9.8.8 accepted by connect ACL accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT +host in hosts_require_helo? no (end of list) using ACL "mail" -processing "warn" (TESTSUITE/test-config 61) +processing "warn" (TESTSUITE/test-config 63) message: added header line check senders = ok@test3 address match test: subject=bad@test1 pattern=ok@test3 bad@test1 in "ok@test3"? no (end of list) warn: condition test failed in ACL "mail" -processing "accept" (TESTSUITE/test-config 63) +processing "accept" (TESTSUITE/test-config 65) check senders = ok@test1 : ok@test3 address match test: subject=bad@test1 pattern=ok@test1 address match test: subject=bad@test1 pattern=ok@test3 @@ -45,15 +46,16 @@ accept: condition test failed in ACL "mail" end of ACL "mail": implicit DENY LOG: MAIN REJECT H=[10.9.8.8] U=CALLER rejected MAIL +host in hosts_require_helo? no (end of list) using ACL "mail" -processing "warn" (TESTSUITE/test-config 61) +processing "warn" (TESTSUITE/test-config 63) message: added header line check senders = ok@test3 address match test: subject=ok@test1 pattern=ok@test3 test1 in "test3"? no (end of list) ok@test1 in "ok@test3"? no (end of list) warn: condition test failed in ACL "mail" -processing "accept" (TESTSUITE/test-config 63) +processing "accept" (TESTSUITE/test-config 65) check senders = ok@test1 : ok@test3 address match test: subject=ok@test1 pattern=ok@test1 test1 in "test1"? yes (matched "test1") @@ -69,13 +71,14 @@ LOG: MAIN REJECT accept: condition test succeeded in ACL "mail" end of ACL "mail": ACCEPT using ACL "rcpt" -processing "accept" (TESTSUITE/test-config 68) +processing "accept" (TESTSUITE/test-config 70) check senders = +ok_senders address match test: subject=ok@test1 pattern=ok@somewhere test1 in "somewhere"? no (end of list) address match test: subject=ok@test1 pattern=ok@test1 test1 in "test1"? yes (matched "test1") ok@test1 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test1") +data from lookup saved for cache for +ok_senders: key 'ok@test1' value 'ok@test1' ok@test1 in "+ok_senders"? yes (matched "+ok_senders") check sender_domains = +ok_sender_domains test1 in "somewhere : test1 : test3"? yes (matched "test1") @@ -87,10 +90,10 @@ LOG: PANIC accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT using ACL "rcpt" -processing "accept" (TESTSUITE/test-config 68) +processing "accept" (TESTSUITE/test-config 70) check senders = +ok_senders cached yes match for +ok_senders -cached lookup data = NULL +cached lookup data = ok@test1 ok@test1 in "+ok_senders"? yes (matched "+ok_senders" - cached) check sender_domains = +ok_sender_domains cached yes match for +ok_sender_domains @@ -103,7 +106,7 @@ accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored Exim version x.yz .... configuration file is TESTSUITE/test-config @@ -120,31 +123,32 @@ 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) using ACL "connect" -processing "deny" (TESTSUITE/test-config 50) +processing "deny" (TESTSUITE/test-config 52) check hosts = : 10.9.8.7 host in ": 10.9.8.7"? no (end of list) deny: condition test failed in ACL "connect" -processing "drop" (TESTSUITE/test-config 51) +processing "drop" (TESTSUITE/test-config 53) l_message: forcibly dropped check hosts = 10.9.8.9 host in "10.9.8.9"? no (end of list) drop: condition test failed in ACL "connect" -processing "accept" (TESTSUITE/test-config 53) +processing "accept" (TESTSUITE/test-config 55) check logwrite = $sender_host_address accepted by connect ACL = 10.9.8.8 accepted by connect ACL LOG: MAIN 10.9.8.8 accepted by connect ACL accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT +host in hosts_require_helo? no (end of list) using ACL "mail" -processing "warn" (TESTSUITE/test-config 61) +processing "warn" (TESTSUITE/test-config 63) message: added header line check senders = ok@test3 address match test: subject=ok@test3 pattern=ok@test3 test3 in "test3"? yes (matched "test3") ok@test3 in "ok@test3"? yes (matched "ok@test3") warn: condition test succeeded in ACL "mail" -processing "accept" (TESTSUITE/test-config 63) +processing "accept" (TESTSUITE/test-config 65) check senders = ok@test1 : ok@test3 address match test: subject=ok@test3 pattern=ok@test1 test3 in "test1"? no (end of list) @@ -162,7 +166,7 @@ LOG: MAIN REJECT accept: condition test succeeded in ACL "mail" end of ACL "mail": ACCEPT using ACL "rcpt" -processing "accept" (TESTSUITE/test-config 68) +processing "accept" (TESTSUITE/test-config 70) check senders = +ok_senders address match test: subject=ok@test3 pattern=ok@somewhere test3 in "somewhere"? no (end of list) @@ -171,6 +175,7 @@ test3 in "test1"? no (end of list) address match test: subject=ok@test3 pattern=ok@test3 test3 in "test3"? yes (matched "test3") ok@test3 in "ok@somewhere : ok@test1 : ok@test3"? yes (matched "ok@test3") +data from lookup saved for cache for +ok_senders: key 'ok@test3' value 'ok@test3' ok@test3 in "+ok_senders"? yes (matched "+ok_senders") check sender_domains = +ok_sender_domains test3 in "somewhere : test1 : test3"? yes (matched "test3") @@ -196,10 +201,10 @@ LOG: MAIN => x R=accept T=appendfile LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> 1999-03-02 09:44:33 ACL "warn" with "message" setting found in a non-message (EHLO or HELO) ACL: cannot specify header lines here: message ignored 1999-03-02 09:44:33 rcpt accepted C=EHLO,MAIL,RCPT 1999-03-02 09:44:33 10HmaX-0005vi-00 10HmaX-0005vi-00 no recipients found in headers