summaryrefslogtreecommitdiff
path: root/test/stderr/0495
diff options
context:
space:
mode:
authorTodd Lyons <tlyons@exim.org>2014-10-22 12:40:33 -0700
committerTodd Lyons <tlyons@exim.org>2014-10-22 12:40:33 -0700
commit74954688e4f61475b2451b2cb22045ab8e7f0150 (patch)
treeb4ffaf926c3c4093637fe12f8c2da2b077e16f32 /test/stderr/0495
parent37ff4e03734cf28bf78c6df892489f99e50d8356 (diff)
parent029f41922c829cd007ec53006076443e38132e64 (diff)
Merge branch 'master' of ssh://git.exim.org/home/git/exim
Diffstat (limited to 'test/stderr/0495')
-rw-r--r--test/stderr/049510
1 files changed, 5 insertions, 5 deletions
diff --git a/test/stderr/0495 b/test/stderr/0495
index d9d8a9a62..b00cfd572 100644
--- a/test/stderr/0495
+++ b/test/stderr/0495
@@ -1,7 +1,7 @@
Delivery failed: Connection refused
-Delivery failed: SMTP error from remote mail server after RCPT TO:<b@x.y>: host 127.0.0.1 [127.0.0.1]: 550 NOTOK
-Delivery failed: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 550 BAD MAIL
-Delivery failed: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 TEMPORARY MAIL FAIL
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<b@x.y>: 550 NOTOK
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 550 BAD MAIL
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 TEMPORARY MAIL FAIL
routing file@x.y yielded a local delivery
routing fail@x.y yielded a failed delivery: forcible fail message
routing defer@x.y yielded a deferred delivery: forcible defer message
@@ -9,6 +9,6 @@ delivery to smarthost failed (configuration problem)
delivery to smarthost failed (configuration problem)
Daemon cannot be run when mua_wrapper is set
Delivery failed: Connection refused
-Delivery failed: Connection timed out: SMTP timeout while connected to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] after RCPT TO:<b@x.y>
+Delivery failed: Connection timed out: H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP timeout after RCPT TO:<b@x.y>
Delivery failed: TCP port "nonexistent" is not defined for t4 transport
-Delivery failed: SMTP error from remote mail server after RCPT TO:<a@x.y>: host 127.0.0.1 [127.0.0.1]: 550 SORRY
+Delivery failed: H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<a@x.y>: 550 SORRY