Rewrites: avoid a split log line when rewiting hits a malformed address. Bug 3160

[exim.git] / test / stderr / 0465

diff --git a/test/stderr/0465 b/test/stderr/0465
index 8bd50d1cbf68cd6c864cef7b72ce154eda1aa129..76820b09df8c5511d39b131d1382827c2ecfaa06 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -69,22 +69,22 @@ search_tidyup called
 To: abc@domain.
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=T:
    To: abc@domain.
 search_tidyup called
 >>Headers after rewriting and local additions:
-T To: abc@domain.
-I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ T To: abc@domain.
+ I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D
-Data file written for message 10HmaY-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D
+Data file written for message 10HmaY-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER (helo=test)
        by myhost.test.ex with local-smtp (Exim x.yz)
-       id 10HmaY-0005vi-00
+       id 10HmaY-000000005vi-0000
        for abc@domain;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"
@@ -92,14 +92,14 @@ 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
+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-0005vi-00-H
+Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H
 Size of headers = sss
 LOG: MAIN
   <= <> U=CALLER P=local-smtp S=sss
 created log directory TESTSUITE/spool/log
-SMTP>> 250 OK id=10HmaY-0005vi-00
+SMTP>> 250 OK id=10HmaY-000000005vi-0000
 smtp_setup_msg entered
 SMTP<< quit
 SMTP>> 221 myhost.test.ex closing connection
@@ -143,22 +143,22 @@ search_tidyup called
 To: abc@xyz.
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=T:
    To: abc@xyz.
 search_tidyup called
 >>Headers after rewriting and local additions:
-T To: abc@xyz.
-I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+ T To: abc@xyz.
+ I Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>
+   Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-Data file name: TESTSUITE/spool//input//10HmaX-0005vi-00-D
-Data file written for message 10HmaX-0005vi-00
+Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D
+Data file written for message 10HmaX-000000005vi-0000
 >>Generated Received: header line
 P Received: from CALLER (helo=test)
        by myhost.test.ex with local-smtp (Exim x.yz)
-       id 10HmaX-0005vi-00
+       id 10HmaX-000000005vi-0000
        for abc@xyz;
        Tue, 2 Mar 1999 09:44:33 +0000
 using ACL "check_data"