summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Breyha <wbreyha@gmx.net>2014-12-19 15:51:45 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2015-01-12 18:58:36 +0000
commit99d03948a2265f0c96aecec3855a03618952cc14 (patch)
tree4bf007835ed2303dcdc4753a784c442585d77a97
parent05faa88b01df9ab61a0f41ffd94b815bf101b6a4 (diff)
DSN: use the SMTP return messsage for Diagnostic-Code lines. Bug 1559
Minor tweaking by JH.
-rw-r--r--test/mail/0211.CALLER6
-rw-r--r--test/mail/0253.lmn2
-rw-r--r--test/mail/0374.CALLER2
-rw-r--r--test/mail/0375.CALLER2
-rw-r--r--test/mail/0531.CALLER6
5 files changed, 9 insertions, 9 deletions
diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index ab4609464..89eadf58d 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 70cca8662..ea91b0187 100644
--- a/test/mail/0253.lmn
+++ b/test/mail/0253.lmn
@@ -38,7 +38,7 @@ Action: failed
Final-Recipient: rfc822;fail@myhost.test.ex
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 6cbbe15a0..859d93d3b 100644
--- a/test/mail/0374.CALLER
+++ b/test/mail/0374.CALLER
@@ -42,7 +42,7 @@ Action: failed
Final-Recipient: rfc822;d3@myhost.test.ex
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 a2929c3c7..569d3f8bf 100644
--- a/test/mail/0375.CALLER
+++ b/test/mail/0375.CALLER
@@ -36,7 +36,7 @@ Action: failed
Final-Recipient: rfc822;e1@myhost.test.ex
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 1d70d8a0a..4d714c756 100644
--- a/test/mail/0531.CALLER
+++ b/test/mail/0531.CALLER
@@ -33,7 +33,7 @@ Action: failed
Final-Recipient: rfc822;userx@test.ex
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@retry.test.ex
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@test.ex
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