DANE: smtp transport option dane_require_tls_ciphers

[users/heiko/exim.git] / test / stderr / 0021

diff --git a/test/stderr/0021 b/test/stderr/0021
index 7c5a79ee947a6dabf98781813d13da29ec36fda0..207889b0d0a58c17b8e484f14ea108fe904ef9fb 100644 (file)
--- a/test/stderr/0021
+++ b/test/stderr/0021
@@ -80,9 +80,10 @@ 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 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
 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"
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 using ACL "rcpt"


@@ -94,14 +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 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
 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
 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
 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


@@ -173,9 +175,10 @@ 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 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
 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:
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 >>Headers added by MAIL or RCPT ACL:


@@ -192,9 +195,9 @@ LOG: MAIN
   => x <x@y> R=accept T=appendfile
 LOG: MAIN
   Completed
   => x <x@y> 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
 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 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