DSN: use the SMTP return messsage for Diagnostic-Code lines. Bug 1559

Minor tweaking by JH.

diff --git a/test/mail/0211.CALLER b/test/mail/0211.CALLER
index ab4609464dcb40a1c6f2e4e7e2b97add5df53a95..89eadf58d2601acb9c8839ecbeaf3d466b21da55 100644 (file)
--- 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 70cca86627c8853e134a2c9b8d98540993696ae2..ea91b0187173e5fc04aa81bb40874b7a5d8bb538 100644 (file)
--- 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 6cbbe15a02431a30c50ace1565d30923ba9560e7..859d93d3bc3c1bb3f7b8ea56d0abc10684995a2f 100644 (file)
--- 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 a2929c3c7603d4c83487fee8a8784ee916a922aa..569d3f8bf7826b354597505dae847dd759e0675e 100644 (file)
--- 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 1d70d8a0ad9b08166d2728549ff4de7363d2271c..4d714c7564826eb397397b81a99dc67085e3758f 100644 (file)
--- 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