DKIM: permit dkim_private_key to override dkim_strict on signing. Bug 2220

[users/jgh/exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 8b9b8ef0bba1d2ae6c297bc4521ff79034ec4c9a..9ff9306902489ba1b76214f85b4475a636af6ca1 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -26,7 +26,8 @@ check set acl_c0 = $acl_c0; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
                  = ; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
                  = ; connect

-accept: condition test succeeded
+accept: condition test succeeded in ACL "connect"
+end of ACL "connect": ACCEPT

 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something
 SMTP>> 220 mail.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
 SMTP<< ehlo something


@@ -34,12 +35,18 @@ something in helo_lookup_domains? no (end of list)
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]
 sender_fullhost = (something) [V4NET.0.0.0]
 sender_rcvhost = [V4NET.0.0.0] (helo=something)
 set_process_info: pppp handling incoming connection from (something) [V4NET.0.0.0]

+host in dsn_advertise_hosts? no (option unset)

 host in pipelining_advertise_hosts? yes (matched "*")
 host in pipelining_advertise_hosts? yes (matched "*")

+host in chunking_advertise_hosts? no (end of list)

 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
 250-SIZE 52428800
 SMTP>> 250-mail.test.ex Hello something [V4NET.0.0.0]
 250-SIZE 52428800

+250-8BITMIME
+250-VRFY

 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>
 250-PIPELINING
 250 HELP
 SMTP<< mail from:<x@y>

+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

 using ACL "mail"
 processing "accept"
 check set acl_c0 = $acl_c0; mail
 using ACL "mail"
 processing "accept"
 check set acl_c0 = $acl_c0; mail


@@ -48,7 +55,8 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
                  = ; connect; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT

 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"


@@ -59,8 +67,10 @@ check set acl_m9 = $acl_m9; rcpt
                  = ; rcpt
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt
                  = ; rcpt
 check set acl_c0 = $acl_c0; rcpt
                  = ; connect; mail; rcpt

-accept: condition test succeeded
+accept: condition test succeeded in ACL "rcpt"
+end of ACL "rcpt": ACCEPT

 SMTP>> 250 Accepted
 SMTP>> 250 Accepted

+DSN: orcpt: NULL  flags: 0

 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called


@@ -69,6 +79,7 @@ search_tidyup called
 search_tidyup called
 >>Headers after rewriting and local additions:
 
 search_tidyup called
 >>Headers after rewriting and local additions:
 

+Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D

 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from [V4NET.0.0.0] (helo=something)
 Data file written for message 10HmaX-0005vi-00
 >>Generated Received: header line
 P Received: from [V4NET.0.0.0] (helo=something)


@@ -82,7 +93,8 @@ check set acl_m0 = $acl_m0; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data

-accept: condition test succeeded
+accept: condition test succeeded in ACL "data"
+end of ACL "data": ACCEPT

 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN
 calling local_scan(); timeout=300
 local_scan() returned 0 NULL
 LOG: MAIN


@@ -99,7 +111,8 @@ check set acl_c9 = $acl_c9; vrfy
                  = ; connect; mail; vrfy
 check set acl_m0 = $acl_m0; vrfy
                  = ; vrfy
                  = ; connect; mail; vrfy
 check set acl_m0 = $acl_m0; vrfy
                  = ; vrfy

-accept: condition test succeeded
+accept: condition test succeeded in ACL "vrfy"
+end of ACL "vrfy": ACCEPT

 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Verifying x@y
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -111,6 +124,8 @@ LOG: MAIN
   VRFY failed for x@y H=(something) [V4NET.0.0.0]
 SMTP>> 550 <x@y> Unrouteable address
 SMTP<< mail from:<x@y>
   VRFY failed for x@y H=(something) [V4NET.0.0.0]
 SMTP>> 550 <x@y> Unrouteable address
 SMTP<< mail from:<x@y>

+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

 using ACL "mail"
 processing "accept"
 check set acl_c0 = $acl_c0; mail
 using ACL "mail"
 processing "accept"
 check set acl_c0 = $acl_c0; mail


@@ -119,11 +134,12 @@ check set acl_c9 = $acl_c9; mail
                  = ; connect; mail; vrfy; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail
                  = ; connect; mail; vrfy; mail
 check set acl_m0 = $acl_m0; mail
                  = ; mail

-accept: condition test succeeded
+accept: condition test succeeded in ACL "mail"
+end of ACL "mail": ACCEPT

 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 SMTP>> 250 OK
 SMTP<< quit
 SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>