Debug: clarify SMTP DATA ops in transport

[exim.git] / test / stderr / 0388

diff --git a/test/stderr/0388 b/test/stderr/0388
index c835b58df85ca9061f3771fa99f25da0d00a9b8f..1c2a5a3886838a06e834d29c59df9ccde96817bc 100644 (file)
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -102,6 +102,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'
 set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK
 address match test: subject=*@127.0.0.1 pattern=*
 127.0.0.1 in "*"? yes (matched "*")
@@ -143,9 +144,9 @@ Deferred addresses:
  EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDWR
  returned from EXIM_DBOPEN: 0xAAAAAAAA
  opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR
-address match test: subject=x@y pattern=*
-y in "*"? yes (matched "*")
-x@y in "*"? yes (matched "*")
+ address match test: subject=x@y pattern=*
+ y in "*"? yes (matched "*")
+ x@y in "*"? yes (matched "*")
 retry for R:x@y = * 0 0
  dbfn_read: key=R:x@y
 failing_interval=ttt message_age=ttt
@@ -153,9 +154,9 @@ Writing retry data for R:x@y
   first failed=dddd last try=dddd next try=+1 expired=1
   errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error
  dbfn_write: key=R:x@y
-address match test: subject=*@V4NET.0.0.0 pattern=*
-V4NET.0.0.0 in "*"? yes (matched "*")
-*@V4NET.0.0.0 in "*"? yes (matched "*")
+ address match test: subject=*@V4NET.0.0.0 pattern=*
+ V4NET.0.0.0 in "*"? yes (matched "*")
+ *@V4NET.0.0.0 in "*"? yes (matched "*")
 retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0
  dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224
 failing_interval=ttt message_age=ttt
@@ -196,10 +197,13 @@ Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
 
-rewrite_one_header: type=F:
-  From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
-rewrite_one_header: type=T:
-  To: CALLER@myhost.test.ex
+qualify & rewrite recipients list
+global rewrite rules
+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