X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/5ea5d64c99a3f99722034f11d7bf79ab9d10f014..be839a2609381f535f263ed0c459a4ebf3fd5d1d:/test/stderr/0021?ds=inline diff --git a/test/stderr/0021 b/test/stderr/0021 index 7c5a79ee9..b9104e1c2 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -13,16 +13,16 @@ 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" +processing "deny" (TESTSUITE/test-config 50) 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" +processing "drop" (TESTSUITE/test-config 51) 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" +processing "accept" (TESTSUITE/test-config 53) check logwrite = $sender_host_address accepted by connect ACL = 10.9.8.8 accepted by connect ACL LOG: MAIN @@ -30,13 +30,13 @@ LOG: MAIN accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT using ACL "mail" -processing "warn" +processing "warn" (TESTSUITE/test-config 61) 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" +processing "accept" (TESTSUITE/test-config 63) check senders = ok@test1 : ok@test3 address match test: subject=bad@test1 pattern=ok@test1 address match test: subject=bad@test1 pattern=ok@test3 @@ -46,14 +46,14 @@ end of ACL "mail": implicit DENY LOG: MAIN REJECT H=[10.9.8.8] U=CALLER rejected MAIL using ACL "mail" -processing "warn" +processing "warn" (TESTSUITE/test-config 61) 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" +processing "accept" (TESTSUITE/test-config 63) check senders = ok@test1 : ok@test3 address match test: subject=ok@test1 pattern=ok@test1 test1 in "test1"? yes (matched "test1") @@ -69,39 +69,42 @@ LOG: MAIN REJECT accept: condition test succeeded in ACL "mail" end of ACL "mail": ACCEPT using ACL "rcpt" -processing "accept" +processing "accept" (TESTSUITE/test-config 68) 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 'test1' ok@test1 in "+ok_senders"? yes (matched "+ok_senders") check sender_domains = +ok_sender_domains test1 in "somewhere : test1 : test3"? yes (matched "test1") test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains") -check logwrite = :panic: rcpt accepted +check logwrite = :panic: rcpt accepted C=$smtp_command_history + = :panic: rcpt accepted C=MAIL,MAIL,RCPT LOG: PANIC - rcpt accepted + rcpt accepted C=MAIL,MAIL,RCPT accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT using ACL "rcpt" -processing "accept" +processing "accept" (TESTSUITE/test-config 68) check senders = +ok_senders cached yes match for +ok_senders -cached lookup data = NULL +cached lookup data = test1 ok@test1 in "+ok_senders"? yes (matched "+ok_senders" - cached) check sender_domains = +ok_sender_domains cached yes match for +ok_sender_domains test1 in "+ok_sender_domains"? yes (matched "+ok_sender_domains" - cached) -check logwrite = :panic: rcpt accepted +check logwrite = :panic: rcpt accepted C=$smtp_command_history + = :panic: rcpt accepted C=MAIL,MAIL,RCPT,RCPT LOG: PANIC - rcpt accepted + rcpt accepted C=MAIL,MAIL,RCPT,RCPT 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 terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (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 @@ -118,16 +121,16 @@ 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" +processing "deny" (TESTSUITE/test-config 50) 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" +processing "drop" (TESTSUITE/test-config 51) 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" +processing "accept" (TESTSUITE/test-config 53) check logwrite = $sender_host_address accepted by connect ACL = 10.9.8.8 accepted by connect ACL LOG: MAIN @@ -135,14 +138,14 @@ LOG: MAIN accept: condition test succeeded in ACL "connect" end of ACL "connect": ACCEPT using ACL "mail" -processing "warn" +processing "warn" (TESTSUITE/test-config 61) 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" +processing "accept" (TESTSUITE/test-config 63) check senders = ok@test1 : ok@test3 address match test: subject=ok@test3 pattern=ok@test1 test3 in "test1"? no (end of list) @@ -160,7 +163,7 @@ LOG: MAIN REJECT accept: condition test succeeded in ACL "mail" end of ACL "mail": ACCEPT using ACL "rcpt" -processing "accept" +processing "accept" (TESTSUITE/test-config 68) check senders = +ok_senders address match test: subject=ok@test3 pattern=ok@somewhere test3 in "somewhere"? no (end of list) @@ -169,13 +172,15 @@ 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 'test3' ok@test3 in "+ok_senders"? yes (matched "+ok_senders") check sender_domains = +ok_sender_domains test3 in "somewhere : test1 : test3"? yes (matched "test3") test3 in "+ok_sender_domains"? yes (matched "+ok_sender_domains") -check logwrite = :panic: rcpt accepted +check logwrite = :panic: rcpt accepted C=$smtp_command_history + = :panic: rcpt accepted C=MAIL,RCPT LOG: PANIC - rcpt accepted + rcpt accepted C=MAIL,RCPT accept: condition test succeeded in ACL "rcpt" end of ACL "rcpt": ACCEPT >>Headers added by MAIL or RCPT ACL: @@ -187,14 +192,16 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid x in "!bad"? yes (end of list) LOG: MAIN => x R=accept T=appendfile LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: smtp_connection MAIN SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (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 +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