Apply timeout to Fsecure malware response. Bug 1549

[exim.git] / test / stderr / 0495

diff --git a/test/stderr/0495 b/test/stderr/0495
index d9d8a9a62c15db10ead2d0dca5a15e9647f43a1e..b00cfd572cc3d1c48062bd22f61b99e093ce164c 100644 (file)
--- a/test/stderr/0495
+++ b/test/stderr/0495
@@ -1,7 +1,7 @@
 Delivery failed: Connection refused
 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
 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 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: 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