diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-12-23 20:07:16 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2015-01-12 18:58:35 +0000 |
| commit | 50dc740948ba43eaeb6d33757bc83beff33f2a64 (patch) | |
| tree | 37f66e9fc90cdba979a6b6474669083d146e7a6d /test/stdout | |
| parent | e0eb00cd78f2dbf91aba5dffa579177b1e1815a1 (diff) | |
Move DSN support to mainline
Affects bug 893
Diffstat (limited to 'test/stdout')
| -rw-r--r-- | test/stdout/0147 | 1 | ||||
| -rw-r--r-- | test/stdout/0338 | 2 | ||||
| -rw-r--r-- | test/stdout/0442 | 1 | ||||
| -rw-r--r-- | test/stdout/3412 | 19 | ||||
| -rw-r--r-- | test/stdout/5204 | 2 |
5 files changed, 22 insertions, 3 deletions
diff --git a/test/stdout/0147 b/test/stdout/0147 index 34ba8bd9c..b877c6110 100644 --- a/test/stdout/0147 +++ b/test/stdout/0147 @@ -25,6 +25,7 @@ debug_print = no_disable_logging domains = driver = accept +no_dsn_lasthop errors_to = expn no_fail_verify_recipient diff --git a/test/stdout/0338 b/test/stdout/0338 index a97751353..52bd7ee37 100644 --- a/test/stdout/0338 +++ b/test/stdout/0338 @@ -19,7 +19,7 @@ NY a2-userx@test.ex NN userx@test.ex 2 userx@test.ex -a1-userx@test.ex postmaster@test.ex 18,0#1 +a1-userx@test.ex 0,0 postmaster@test.ex 18,0#3 dddP Received: from CALLER by myhost.test.ex with local (Exim x.yz) (envelope-from <CALLER@test.ex>) diff --git a/test/stdout/0442 b/test/stdout/0442 index 1c032698a..b47d7b31b 100644 --- a/test/stdout/0442 +++ b/test/stdout/0442 @@ -10,6 +10,7 @@ debug_print = no_disable_logging domains = driver = accept +no_dsn_lasthop errors_to = expn no_fail_verify_recipient diff --git a/test/stdout/3412 b/test/stdout/3412 index b7c7a379f..613d6dbb1 100644 --- a/test/stdout/3412 +++ b/test/stdout/3412 @@ -22,10 +22,15 @@ X-Failed-Recipients: x@test.ex Auto-Submitted: auto-replied From: Mail Delivery System <Mailer-Daemon@myhost.test.ex> To: CALLER@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 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: text/plain; charset=us-ascii + This message was created automatically by mail delivery software. A message that you sent could not be delivered to one or more of its @@ -34,7 +39,17 @@ recipients. This is a permanent error. The following address(es) failed: x@test.ex no deliveries made locally ------- This is a copy of the message, including all the headers. ------ +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/delivery-status + +Reporting-MTA: dns; myhost.test.ex + +Action: failed +Final-Recipient: rfc822;x@test.ex +Status: 5.0.0 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM +Content-type: message/rfc822 Return-path: <CALLER@myhost.test.ex> Received: from CALLER by myhost.test.ex with local (Exim x.yz) @@ -45,6 +60,8 @@ Message-Id: <E10HmaX-0005vi-00@myhost.test.ex> From: CALLER_NAME <CALLER@myhost.test.ex> Date: Tue, 2 Mar 1999 09:44:33 +0000 + +--NNNNNNNNNN-eximdsn-MMMMMMMMMM-- . 250 OK QUIT diff --git a/test/stdout/5204 b/test/stdout/5204 index 532eb41d7..5d438bb35 100644 --- a/test/stdout/5204 +++ b/test/stdout/5204 @@ -25,5 +25,5 @@ postmaster@test.ex 250-PIPELINING
250 HELP
250 OK
-550 cannot route this one (FAIL)
+550 cannot route this one=(FAIL)
221 myhost.test.ex closing connection
|