diff options
| author | Todd Lyons <tlyons@exim.org> | 2014-10-22 12:40:33 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-10-22 12:40:33 -0700 |
| commit | 74954688e4f61475b2451b2cb22045ab8e7f0150 (patch) | |
| tree | b4ffaf926c3c4093637fe12f8c2da2b077e16f32 /test/stderr/0358 | |
| parent | 37ff4e03734cf28bf78c6df892489f99e50d8356 (diff) | |
| parent | 029f41922c829cd007ec53006076443e38132e64 (diff) | |
Merge branch 'master' of ssh://git.exim.org/home/git/exim
Diffstat (limited to 'test/stderr/0358')
| -rw-r--r-- | test/stderr/0358 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/stderr/0358 b/test/stderr/0358 index b2d9a13a1..7eec3d43f 100644 --- a/test/stderr/0358 +++ b/test/stderr/0358 @@ -36,9 +36,9 @@ reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess added retry item LOG: MAIN - == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error LOG: MAIN - == usery@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == usery@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: @@ -49,13 +49,13 @@ retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:usery@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+1 expired=0 - errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error userx@test.ex retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+1 expired=0 - errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -114,9 +114,9 @@ reading retry information for R:usery@test.ex from subprocess reading retry information for R:usery@test.ex:<CALLER@test.ex> from subprocess delete item not added: non-delete item exists LOG: MAIN - == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error LOG: MAIN - == usery@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == usery@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: @@ -129,7 +129,7 @@ retry for R:usery@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:usery@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 - errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error userx@test.ex deleted retry information for R:userx@test.ex deleted retry information for R:test.ex @@ -137,7 +137,7 @@ retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 - errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error end of retry processing LOG: queue_run MAIN End queue run: pid=pppp |