diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-11-06 15:50:12 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-11-06 15:50:12 +0000 |
| commit | 48c7f9e2e3b50cd5548447de62c77c7ddfe21519 (patch) | |
| tree | 588f2c5e5885f5e9f67d5faba9045a0c76f84cb5 /test/stdout | |
| parent | 520de300979cb6cf448cd23f729dd39368202a16 (diff) | |
Include sender address in retry key for 4xx errors.
Diffstat (limited to 'test/stdout')
| -rw-r--r-- | test/stdout/0357 | 6 | ||||
| -rw-r--r-- | test/stdout/0358 | 8 | ||||
| -rw-r--r-- | test/stdout/0474 | 2 | ||||
| -rw-r--r-- | test/stdout/0497 | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/test/stdout/0357 b/test/stdout/0357 index 51545f157..f7864bf4b 100644 --- a/test/stdout/0357 +++ b/test/stdout/0357 @@ -1,11 +1,11 @@ +++++++++++++++++++++++++++ - R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 2 ******** SERVER ******** diff --git a/test/stdout/0358 b/test/stdout/0358 index 314342dc6..ab77a784e 100644 --- a/test/stdout/0358 +++ b/test/stdout/0358 @@ -1,12 +1,12 @@ +++++++++++++++++++++++++++ - R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 - R:usery@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:usery@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 2 - R:usery@test.ex -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:usery@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error first failed = time last try = time2 next try = time2 + 2 ******** SERVER ******** diff --git a/test/stdout/0474 b/test/stdout/0474 index cd9c9c281..ee42c1e32 100644 --- a/test/stdout/0474 +++ b/test/stdout/0474 @@ -5,7 +5,7 @@ first failed = time last try = time2 next try = time2 + 10 T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH first failed = time last try = time2 next try = time2 + 10 +++++++++++++++++++++++++++ - R:abcd@xyz -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH + R:abcd@xyz:<CALLER@the.local.host.name> -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH first failed = time last try = time2 next try = time2 + 10 ******** SERVER ******** diff --git a/test/stdout/0497 b/test/stdout/0497 index 6755d429e..3462fd1b3 100644 --- a/test/stdout/0497 +++ b/test/stdout/0497 @@ -2,7 +2,7 @@ T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 452 temporary error first failed = time last try = time2 next try = time2 + 0 * +++++++++++++++++++++++++++ - R:userx@x.y -44 13377 SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error + R:userx@x.y:<CALLER@myhost.test.ex> -44 13377 SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error first failed = time last try = time2 next try = time2 + 0 * ******** SERVER ******** |