ARC: reset headers before signing for secondary MX. Bug 2886

[exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index c2c52706811da7bc8c8b124dbf915e2dac53d9cc..ae038dfff437f1a6af269d4c739be91a167040b1 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -16,6 +16,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
 SMTP<< mail from:<>
 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
@@ -49,6 +51,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
 SMTP<< mail from:<>
 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
@@ -58,15 +62,17 @@ processing "accept" (TESTSUITE/test-config 22)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 To: abc@domain.
 
-rewrite_one_header: type=T:
-  To: abc@domain.
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
+ rewrite_one_header: type=T:
+   To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:
 T To: abc@domain.
@@ -76,18 +82,17 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
 Data file written for message 10HmaY-0005vi-00
 >>Generated Received: header line
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaY-0005vi-00
-       for abc@domain; Tue, 2 Mar 1999 09:44:33 +0000
+       for abc@domain;
+       Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
 processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax
 accept: condition test succeeded in ACL "check_data"
 end of ACL "check_data": ACCEPT
 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00
-DSN: Write SPOOL: -dsn_envid NULL
-DSN: Write SPOOL  :-dsn_ret 0
-DSN: Flags: 0x0
 DSN: **** SPOOL_OUT - address: <abc@domain> errorsto: <NULL> orcpt: <NULL> dsn_flags: 0x0
 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H
 Size of headers = sss
@@ -120,6 +125,8 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER
 SMTP>> 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 smtp_setup_msg entered
+SMTP<< helo test
+SMTP>> 250 myhost.test.ex Hello CALLER at test
 SMTP<< mail from:<>
 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
@@ -129,15 +136,17 @@ processing "accept" (TESTSUITE/test-config 22)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
 SMTP>> 250 Accepted
-DSN: orcpt: NULL  flags: 0
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 >>Headers received:
 To: abc@xyz.
 
-rewrite_one_header: type=T:
-  To: abc@xyz.
+qualify & rewrite recipients list
+global rewrite rules
+rewrite headers
+ rewrite_one_header: type=T:
+   To: abc@xyz.
 search_tidyup called
 >>Headers after rewriting and local additions:
 T To: abc@xyz.
@@ -147,9 +156,11 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 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 CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaX-0005vi-00
-       for abc@xyz; Tue, 2 Mar 1999 09:44:33 +0000
+       for abc@xyz;
+       Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
 processing "accept" (TESTSUITE/test-config 20)
 check verify = header_syntax