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

[exim.git] / test / stderr / 0388

diff --git a/test/stderr/0388 b/test/stderr/0388
index 30baccef2df1e8d0e5670ce6af48b250df33749b..784cc3913c71e06024632a842f3570b52588b2a5 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -108,7 +108,7 @@ cmd buf flush ddd bytes (more expected)
   SMTP(shutdown)>>
   SMTP<< 250 OK
   SMTP(close)>>
-cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK
 *@127.0.0.1 in "*"?
  list element: *
@@ -130,7 +130,7 @@ set_process_info: pppp delivering 10HmaX-000000005vi-0000 to V4NET.0.0.0 [V4NET.
 Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... V4NET.0.0.0 in hosts_try_fastopen?
  failed: Network Error
 LOG: MAIN
-  H=V4NET.0.0.0 [V4NET.0.0.0] Network unreachable
+  H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER
 added retry item for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S: errno=dd more_errno=dd,A flags=2
 set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish
@@ -142,7 +142,7 @@ reading retry information for R:x@y from subprocess
   added retry item
 set_process_info: pppp delivering 10HmaX-000000005vi-0000
 LOG: MAIN
-  == x@y R=r1 T=smtp defer (dd): Network unreachable H=127.0.0.1 [127.0.0.1]
+  == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1]
 changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1234
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
@@ -183,7 +183,7 @@ failing_interval=ttt message_age=ttt
 on queue longer than maximum retry
 Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S
   first failed=dddd last try=dddd next try=+0 expired=0
-  errno=dd more_errno=dd,A Network unreachable
+  errno=dd more_errno=dd,A Network Error
  dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S
 timed out: all retries expired
 LOG: MAIN
@@ -218,24 +218,24 @@ MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 
 qualify & rewrite recipients list
-global rewrite rules
-rewrite headers
+rewrite rules on sender address
+qualify and rewrite headers
  rewrite_one_header: type=F:
    From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
  rewrite_one_header: type=T:
    To: CALLER@myhost.test.ex
 search_tidyup called
 >>Headers after rewriting and local additions:
-  X-Failed-Recipients: x@y
-  Auto-Submitted: auto-replied
-F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
-T To: CALLER@myhost.test.ex
-  References: <E10HmaX-000000005vi-0000@myhost.test.ex>
-  Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
-  MIME-Version: 1.0
-  Subject: Mail delivery failed: returning message to sender
-I Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
-  Date: Tue, 2 Mar 1999 09:44:33 +0000
+   X-Failed-Recipients: x@y
+   Auto-Submitted: auto-replied
+ F From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
+ T To: CALLER@myhost.test.ex
+   References: <E10HmaX-000000005vi-0000@myhost.test.ex>
+   Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
+   MIME-Version: 1.0
+   Subject: Mail delivery failed: returning message to sender
+ 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-000000005vi-0000-D
 Data file written for message 10HmaY-000000005vi-0000