Gitweb:
http://git.exim.org/exim.git/commitdiff/99d03948a2265f0c96aecec3855a03618952cc14
Commit: 99d03948a2265f0c96aecec3855a03618952cc14
Parent: 05faa88b01df9ab61a0f41ffd94b815bf101b6a4
Author: Wolfgang Breyha <wbreyha@???>
AuthorDate: Fri Dec 19 15:51:45 2014 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Mon Jan 12 18:58:36 2015 +0000
DSN: use the SMTP return messsage for Diagnostic-Code lines. Bug 1559
Minor tweaking by JH.
---
test/mail/0211.CALLER | 6 +++---
test/mail/0253.lmn | 2 +-
test/mail/0374.CALLER | 2 +-
test/mail/0375.CALLER | 2 +-
test/mail/0531.CALLER | 6 +++---
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index ab46094..89eadf5 100644
--- a/test/mail/0211.CALLER
+++ b/test/mail/0211.CALLER
@@ -35,7 +35,7 @@ Action: failed
Final-Recipient: rfc822;userx@domain1
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 550 Go away
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
@@ -95,12 +95,12 @@ Action: failed
Final-Recipient: rfc822;userx@domain1
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 550 Go away
Action: failed
Final-Recipient: rfc822;usery@domain2
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 550 Go away
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
diff --git a/test/mail/0253.lmn b/test/mail/0253.lmn
index 70cca86..ea91b01 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -38,7 +38,7 @@ Action: failed
Final-Recipient: rfc822;fail@???
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 550 Recipient not OK
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
diff --git a/test/mail/0374.CALLER b/test/mail/0374.CALLER
index 6cbbe15..859d93d 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -42,7 +42,7 @@ Action: failed
Final-Recipient: rfc822;d3@???
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 550 hard error
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
diff --git a/test/mail/0375.CALLER b/test/mail/0375.CALLER
index a2929c3..569d3f8 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -36,7 +36,7 @@ Action: failed
Final-Recipient: rfc822;e1@???
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 550 hard error
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
diff --git a/test/mail/0531.CALLER b/test/mail/0531.CALLER
index 1d70d8a..4d714c7 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -33,7 +33,7 @@ Action: failed
Final-Recipient: rfc822;userx@???
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
@@ -85,7 +85,7 @@ Action: failed
Final-Recipient: rfc822;userx@???
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; 0
+Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
@@ -139,7 +139,7 @@ Action: failed
Final-Recipient: rfc822;userx@???
Status: 5.0.0
Remote-MTA: dns; 127.0.0.1
-Diagnostic-Code: smtp; -44
+Diagnostic-Code: smtp; 450 TEMPERROR: retry timeout exceeded
--NNNNNNNNNN-eximdsn-MMMMMMMMMM
Content-type: message/rfc822
