X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/cd5567b149ce1b810dbc06f521ad480d9be533bd..bffc2609553745d57e15942505f34cbdd3c26b7f:/test/stderr/0021?ds=sidebyside diff --git a/test/stderr/0021 b/test/stderr/0021 index 4f43e05c9..207889b0d 100644 --- a/test/stderr/0021 +++ b/test/stderr/0021 @@ -18,6 +18,7 @@ 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" +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" @@ -27,8 +28,10 @@ check logwrite = $sender_host_address 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 using ACL "mail" processing "warn" + 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) @@ -44,6 +47,7 @@ LOG: MAIN REJECT H=[10.9.8.8] U=CALLER rejected MAIL using ACL "mail" processing "warn" + message: added header line check senders = ok@test3 address match test: subject=ok@test1 pattern=ok@test3 test1 in "test3"? no (end of list) @@ -63,6 +67,7 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu LOG: MAIN REJECT mail accepted "mail from:" "" accept: condition test succeeded in ACL "mail" +end of ACL "mail": ACCEPT using ACL "rcpt" processing "accept" check senders = +ok_senders @@ -75,10 +80,12 @@ 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" check senders = +ok_senders @@ -88,13 +95,15 @@ 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 (msg setup toplevel) 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 @@ -116,6 +125,7 @@ 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" +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" @@ -125,8 +135,10 @@ check logwrite = $sender_host_address 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 using ACL "mail" processing "warn" + message: added header line check senders = ok@test3 address match test: subject=ok@test3 pattern=ok@test3 test3 in "test3"? yes (matched "test3") @@ -148,6 +160,7 @@ check logwrite = :main,reject: mail accepted "$smtp_command" "$smtp_command_argu LOG: MAIN REJECT mail accepted "mail from:" "" accept: condition test succeeded in ACL "mail" +end of ACL "mail": ACCEPT using ACL "rcpt" processing "accept" check senders = +ok_senders @@ -162,11 +175,12 @@ 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" -host in ignore_fromline_hosts? no (option unset) +end of ACL "rcpt": ACCEPT >>Headers added by MAIL or RCPT ACL: X-ACL-Warn: added header line >> @@ -176,15 +190,14 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user -skipping ACL configuration - not needed 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 (main) 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 (msg setup toplevel) 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