DMARC: expand main-config options. Bug 3102

[exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index 3b0d8418d35be48453360c48a98215d716f3aec0..9518d278e698f753a1f019be1af3cc1ffd2fa79b 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -60,7 +60,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@domain.>

-processing "accept" (TESTSUITE/test-config 22)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted


@@ -68,7 +68,7 @@ SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:

-To: abc@domain.
+ To: abc@domain.

 
 qualify & rewrite recipients list
 rewrite rules on sender address
 
 qualify & rewrite recipients list
 rewrite rules on sender address


@@ -90,10 +90,10 @@ P Received: from CALLER (helo=test)
        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"

-processing "accept" (TESTSUITE/test-config 20)
+processing ACL check_data "accept" (TESTSUITE/test-config 20)

 check verify = header_syntax
 check verify = header_syntax

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

 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <abc@domain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000
 DSN: **** SPOOL_OUT - address: <abc@domain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H


@@ -135,7 +135,7 @@ spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 SMTP>> 250 OK
 SMTP<< rcpt to:<abc@xyz>

-processing "accept" (TESTSUITE/test-config 22)
+processing inline ACL "accept"

 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted


@@ -143,7 +143,7 @@ SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:

-To: abc@xyz.
+ To: abc@xyz.

 
 qualify & rewrite recipients list
 rewrite rules on sender address
 
 qualify & rewrite recipients list
 rewrite rules on sender address


@@ -167,10 +167,10 @@ P Received: from CALLER (helo=test)
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"

-processing "accept" (TESTSUITE/test-config 20)
+processing ACL check_data "accept" (TESTSUITE/test-config 20)

 check verify = header_syntax
 check verify = header_syntax

-accept: condition test failed in ACL "check_data"
-end of ACL "check_data": implicit DENY
+accept: condition test failed in ACL check_data
+end of ACL check_data: implicit DENY

 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.
 SMTP>> 550 Administrative prohibition
 LOG: MAIN REJECT
   U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.