From bf63a0db77403ca5f11889adbb978fbfcfec4988 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 29 Aug 2020 17:39:51 +0100 Subject: [PATCH] add an internal error code definition --- src/src/log.c | 3 ++- src/src/macros.h | 19 ++++++++++--------- test/log/0055 | 4 ++-- test/log/0098 | 20 ++++++++++---------- test/log/0099 | 4 ++-- test/log/0135 | 4 ++-- test/log/0163 | 2 +- test/log/0195 | 4 ++-- test/log/0197 | 6 +++--- test/log/0198 | 6 +++--- test/log/0209 | 18 +++++++++--------- test/log/0247 | 2 +- test/log/0264 | 18 +++++++++--------- test/log/0288 | 2 +- test/log/0332 | 4 ++-- test/log/0333 | 2 +- test/log/0343 | 2 +- test/log/0357 | 2 +- test/log/0476 | 2 +- test/log/0529 | 2 +- test/log/0543 | 2 +- test/log/0570 | 8 ++++---- test/log/0611 | 4 ++-- test/log/0618 | 6 +++--- test/log/3206 | 2 +- test/log/5510 | 2 +- test/log/5707 | 2 +- test/msglog/0197.10HmaY-0005vi-00 | 6 +++--- test/msglog/0198.10HmaZ-0005vi-00 | 2 +- test/msglog/0198.10HmbA-0005vi-00 | 2 +- test/msglog/0198.10HmbC-0005vi-00 | 2 +- test/stderr/0055 | 4 ++-- test/stderr/0332 | 4 ++-- test/stderr/0333 | 2 +- test/stderr/0357 | 2 +- test/stderr/0476 | 2 +- test/stderr/0529 | 2 +- test/stderr/0543 | 2 +- 38 files changed, 92 insertions(+), 90 deletions(-) diff --git a/src/src/log.c b/src/src/log.c index 9f3f45e2a..88cc12cd4 100644 --- a/src/src/log.c +++ b/src/src/log.c @@ -105,7 +105,8 @@ static const uschar * exim_errstrings[] = { US"Negotiation failed for proxy configured host", US"Authenticator 'other' failure", US"target not supporting SMTPUTF8", - US"", + US"host is local", + US"tainted filename", US"Not time for routing", US"Not time for local delivery", diff --git a/src/src/macros.h b/src/src/macros.h index 4c5279f0a..2a03717d8 100644 --- a/src/src/macros.h +++ b/src/src/macros.h @@ -562,19 +562,20 @@ table exim_errstrings[] in log.c */ #define ERRNO_AUTHPROB (-48) /* Authenticator "other" failure */ #define ERRNO_UTF8_FWD (-49) /* target not supporting SMTPUTF8 */ #define ERRNO_HOST_IS_LOCAL (-50) /* Transport refuses to talk to localhost */ +#define ERRNO_TAINT (-51) /* Transport refuses to talk use tainted filename */ /* These must be last, so all retry deferments can easily be identified */ -#define ERRNO_RETRY_BASE (-51) /* Base to test against */ -#define ERRNO_RRETRY (-51) /* Not time for routing */ +#define ERRNO_RETRY_BASE (-52) /* Base to test against */ +#define ERRNO_RRETRY (-52) /* Not time for routing */ -#define ERRNO_WARN_BASE (-52) /* Base to test against */ -#define ERRNO_LRETRY (-52) /* Not time for local delivery */ -#define ERRNO_HRETRY (-53) /* Not time for any remote host */ -#define ERRNO_LOCAL_ONLY (-54) /* Local-only delivery */ -#define ERRNO_QUEUE_DOMAIN (-55) /* Domain in queue_domains */ -#define ERRNO_TRETRY (-56) /* Transport concurrency limit */ -#define ERRNO_EVENT (-57) /* Event processing request alternate response */ +#define ERRNO_WARN_BASE (-53) /* Base to test against */ +#define ERRNO_LRETRY (-53) /* Not time for local delivery */ +#define ERRNO_HRETRY (-54) /* Not time for any remote host */ +#define ERRNO_LOCAL_ONLY (-55) /* Local-only delivery */ +#define ERRNO_QUEUE_DOMAIN (-56) /* Domain in queue_domains */ +#define ERRNO_TRETRY (-57) /* Transport concurrency limit */ +#define ERRNO_EVENT (-58) /* Event processing request alternate response */ diff --git a/test/log/0055 b/test/log/0055 index 51d31aa3d..e8f7f97ac 100644 --- a/test/log/0055 +++ b/test/log/0055 @@ -5,7 +5,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 == xxx@local.test.ex routing defer (-55): domain is in queue_domains +1999-03-02 09:44:33 10HmaZ-0005vi-00 == xxx@local.test.ex routing defer (-56): domain is in queue_domains 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -ql 1999-03-02 09:44:33 10HmaZ-0005vi-00 *> xxx@local.test.ex R=localreally T=local_delivery @@ -37,6 +37,6 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 *> xxx@ten-2.test.ex R=lookuphost T=smtp H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option" 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@myhost.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbG-0005vi-00 == xxx@local.test.ex routing defer (-55): domain is in queue_domains +1999-03-02 09:44:33 10HmbG-0005vi-00 == xxx@local.test.ex routing defer (-56): domain is in queue_domains 1999-03-02 09:44:33 10HmbG-0005vi-00 *> xxx@local.test.ex R=localreally T=local_delivery 1999-03-02 09:44:33 10HmbG-0005vi-00 Completed diff --git a/test/log/0098 b/test/log/0098 index f18ef64d0..5aed642ac 100644 --- a/test/log/0098 +++ b/test/log/0098 @@ -38,19 +38,19 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (dd): Connection refused 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file R=userforward defer (-30): pipe_transport unset in userforward router -1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (-53): retry time not reached for any host for 'some.domain' -1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (-53): retry time not reached for any host for 'connection.refused' +1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (-54): retry time not reached for any host for 'some.domain' +1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (-54): retry time not reached for any host for 'connection.refused' 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == |/non/existing/file R=userforward defer (-30): pipe_transport unset in userforward router -1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (-53): retry time not reached for any host for 'some.domain' +1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@test.ex routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmaZ-0005vi-00 == defer@another.test.ex routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbB-0005vi-00 == xxxx@some.domain R=all T=smtp defer (-54): retry time not reached for any host for 'some.domain' 1999-03-02 09:44:33 10HmbD-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmbD-0005vi-00 == yyyy@connection.refused R=refused T=smtp_connect_refused defer (dd): Connection refused 1999-03-02 09:44:33 End queue run: pid=pppp @@ -115,7 +115,7 @@ 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss T="testing a remote defer" 1999-03-02 09:44:33 10HmbM-0005vi-00 == rrrr@remote.defer R=remote_quota T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Over-quota 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbM-0005vi-00 == rrrr@remote.defer routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbM-0005vi-00 == rrrr@remote.defer routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbN-0005vi-00 <= <> R=10HmbM-0005vi-00 U=EXIMUSER P=local S=sss T="Warning: message 10HmbM-0005vi-00 delayed 0 minutes" 1999-03-02 09:44:33 10HmbN-0005vi-00 => CALLER R=localuser T=local_delivery 1999-03-02 09:44:33 10HmbN-0005vi-00 Completed diff --git a/test/log/0099 b/test/log/0099 index 13a1916c1..71f462c27 100644 --- a/test/log/0099 +++ b/test/log/0099 @@ -2,7 +2,7 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (dd): Connection refused 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (-53): retry time not reached for any host for 'simple' +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@simple R=all T=smtp defer (-54): retry time not reached for any host for 'simple' 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused @@ -16,7 +16,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=thishost.test.ex [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@simple R=all T=smtp defer (dd): Connection refused 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for with@complex -1999-03-02 09:44:33 10HmbA-0005vi-00 == with@complex R=all T=smtp defer (-53): retry time not reached for any host for 'complex' +1999-03-02 09:44:33 10HmbA-0005vi-00 == with@complex R=all T=smtp defer (-54): retry time not reached for any host for 'complex' 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for without@complex 1999-03-02 09:44:33 10HmbB-0005vi-00 H=thisloop.test.ex [ip4.ip4.ip4.ip4] Connection refused 1999-03-02 09:44:33 10HmbB-0005vi-00 H=thisloop.test.ex [127.0.0.1] Connection refused diff --git a/test/log/0135 b/test/log/0135 index 31ab94f28..390b633ae 100644 --- a/test/log/0135 +++ b/test/log/0135 @@ -13,8 +13,8 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == d@test.ex R=smart T=local_delivery defer (-52): Retry time not yet reached -1999-03-02 09:44:33 10HmaX-0005vi-00 == a@unknown.ex R=default T=smtp defer (-53): retry time not reached for any host for 'unknown.ex' +1999-03-02 09:44:33 10HmaX-0005vi-00 == d@test.ex R=smart T=local_delivery defer (-53): Retry time not yet reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == a@unknown.ex R=default T=smtp defer (-54): retry time not reached for any host for 'unknown.ex' 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@test.ex R=smart T=local_delivery defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/d) diff --git a/test/log/0163 b/test/log/0163 index bbe86895f..37bfe210a 100644 --- a/test/log/0163 +++ b/test/log/0163 @@ -2,5 +2,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-19) H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to end of data: 550 There is a problem with the message, but this response line is over the limit for reasonable SMTP responses. 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 12345678901234567890123456789012345678901234567890 1234567890123456789012345678901234567890123456 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-53): retry time not reached for any host for 'domain.com' +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain.com R=all T=smtp defer (-54): retry time not reached for any host for 'domain.com' 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0195 b/test/log/0195 index 50f0aa79a..99111d92e 100644 --- a/test/log/0195 +++ b/test/log/0195 @@ -12,7 +12,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 => usery R=all T=local_delivery 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@myhost.test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@myhost.test.ex routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@myhost.test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmaX-0005vi-00 == usery@myhost.test.ex R=defer defer (-1): forcibly deferred 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0197 b/test/log/0197 index d7b929fda..838a47a15 100644 --- a/test/log/0197 +++ b/test/log/0197 @@ -7,9 +7,9 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 <= doesn't@matter U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 10HmaY-0005vi-00 => x@copy.domain R=checkcopy T=makecopy 1999-03-02 09:44:33 10HmaY-0005vi-00 -> y@copy.domain R=checkcopy T=makecopy -1999-03-02 09:44:33 10HmaY-0005vi-00 == x@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host for 'copy.domain' -1999-03-02 09:44:33 10HmaY-0005vi-00 == y@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host for 'copy.domain' -1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host for 'elsewhere' +1999-03-02 09:44:33 10HmaY-0005vi-00 == x@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' +1999-03-02 09:44:33 10HmaY-0005vi-00 == y@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' +1999-03-02 09:44:33 10HmaY-0005vi-00 == z@elsewhere R=passall T=pass_on defer (-54): retry time not reached for any host for 'elsewhere' 1999-03-02 09:44:33 Start queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@copy.domain R=passall T=pass_on defer (dd): Network Error diff --git a/test/log/0198 b/test/log/0198 index 36091bdc0..75e1854d0 100644 --- a/test/log/0198 +++ b/test/log/0198 @@ -3,9 +3,9 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@copy.domain R=check_file T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@the.local.host.name R=passall T=pass_on defer (-53): retry time not reached for any host for 'the.local.host.name' +1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@the.local.host.name R=passall T=pass_on defer (-54): retry time not reached for any host for 'the.local.host.name' 1999-03-02 09:44:33 10HmbA-0005vi-00 <= doesn't@matter U=CALLER P=local-bsmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name 1999-03-02 09:44:33 10HmbA-0005vi-00 ** y@copy.domain: Unrouteable address -1999-03-02 09:44:33 10HmbA-0005vi-00 == x@copy.domain R=check_file T=pass_on defer (-53): retry time not reached for any host for 'copy.domain' +1999-03-02 09:44:33 10HmbA-0005vi-00 == x@copy.domain R=check_file T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' 1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 10HmbC-0005vi-00 == doesn't@matter R=passall T=pass_on defer (-53): retry time not reached for any host for 'matter' +1999-03-02 09:44:33 10HmbC-0005vi-00 == doesn't@matter R=passall T=pass_on defer (-54): retry time not reached for any host for 'matter' diff --git a/test/log/0209 b/test/log/0209 index aae3d4986..8e549c30b 100644 --- a/test/log/0209 +++ b/test/log/0209 @@ -4,7 +4,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 R=others T=smtp defer (0): SMTP delivery explicitly queued 1999-03-02 09:44:33 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 == userz@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 450 Temporary error -1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaY-0005vi-00 == userz@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed @@ -19,19 +19,19 @@ 1999-03-02 09:44:33 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 450 Temporary error 1999-03-02 09:44:33 10HmaZ-0005vi-00 => usery@domain1 R=others T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" -1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 R=others T=smtp defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 450 Temporary error -1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == userx@domain1 routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == userx@domain1 R=others T=smtp defer (dd): Connection refused diff --git a/test/log/0247 b/test/log/0247 index b0b0123d9..d591c41e7 100644 --- a/test/log/0247 +++ b/test/log/0247 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 => :blackhole: R=d1 1999-03-02 09:44:33 10HmaX-0005vi-00 => /dev/null R=d1 T=**bypassed** 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == other@myhost.test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == other@myhost.test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0264 b/test/log/0264 index 599ea4716..ba4db7549 100644 --- a/test/log/0264 +++ b/test/log/0264 @@ -5,7 +5,7 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=local_delivery defer (-52): Retry time not yet reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=local_delivery defer (-53): Retry time not yet reached 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userz R=r1 T=local_delivery 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp @@ -15,10 +15,10 @@ 1999-03-02 09:44:33 10HmbB-0005vi-00 == notuser2@test.ex R=r2 T=local_delivery2 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/notuser2) 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=local_delivery defer (-52): Retry time not yet reached -1999-03-02 09:44:33 10HmbA-0005vi-00 == notuser@test.ex R=r2 T=local_delivery2 defer (-52): Retry time not yet reached -1999-03-02 09:44:33 10HmbB-0005vi-00 == notuser2@test.ex R=r2 T=local_delivery2 defer (-52): Retry time not yet reached -1999-03-02 09:44:33 10HmbC-0005vi-00 == notuser3@test.ex R=r2 T=local_delivery2 defer (-52): Retry time not yet reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex R=r1 T=local_delivery defer (-53): Retry time not yet reached +1999-03-02 09:44:33 10HmbA-0005vi-00 == notuser@test.ex R=r2 T=local_delivery2 defer (-53): Retry time not yet reached +1999-03-02 09:44:33 10HmbB-0005vi-00 == notuser2@test.ex R=r2 T=local_delivery2 defer (-53): Retry time not yet reached +1999-03-02 09:44:33 10HmbC-0005vi-00 == notuser3@test.ex R=r2 T=local_delivery2 defer (-53): Retry time not yet reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 removed by CALLER 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed @@ -32,7 +32,7 @@ 1999-03-02 09:44:33 10HmbD-0005vi-00 == r3.a@outside R=r3 defer (-1): not just now 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbD-0005vi-00 == r3.a@outside routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbD-0005vi-00 == r3.a@outside routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbE-0005vi-00 == r3.b@outside R=r3 defer (-1): not just now 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbD-0005vi-00 removed by CALLER @@ -43,7 +43,7 @@ 1999-03-02 09:44:33 10HmbF-0005vi-00 == r4.a@outside R=r4 defer (-1): not just now 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbF-0005vi-00 == r4.a@outside routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbF-0005vi-00 == r4.a@outside routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbG-0005vi-00 == r4.b@outside R=r4 defer (-1): not just now 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbH-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss @@ -59,6 +59,6 @@ 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbJ-0005vi-00 == rz.b@outside R=r_remain defer (-1): not just now 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbI-0005vi-00 == rz.a@outside routing defer (-51): retry time not reached -1999-03-02 09:44:33 10HmbJ-0005vi-00 == rz.b@outside routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbI-0005vi-00 == rz.a@outside routing defer (-52): retry time not reached +1999-03-02 09:44:33 10HmbJ-0005vi-00 == rz.b@outside routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0288 b/test/log/0288 index f5bc3d53b..15c17f77c 100644 --- a/test/log/0288 +++ b/test/log/0288 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == b@test.ex R=all T=smtp defer (-53): connection limit reached for all hosts for 'test.ex' +1999-03-02 09:44:33 10HmaX-0005vi-00 == b@test.ex R=all T=smtp defer (-54): connection limit reached for all hosts for 'test.ex' 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp diff --git a/test/log/0332 b/test/log/0332 index d83deb12c..7e64fd454 100644 --- a/test/log/0332 +++ b/test/log/0332 @@ -6,7 +6,7 @@ 1999-03-02 09:44:33 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer +1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer 1999-03-02 09:44:33 10HmaY-0005vi-00 => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" -1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0333 b/test/log/0333 index af0411fad..4bd784a46 100644 --- a/test/log/0333 +++ b/test/log/0333 @@ -5,5 +5,5 @@ 1999-03-02 09:44:33 10HmaY-0005vi-00 == ok@no.delay R=r1 T=t1 defer (0): SMTP delivery explicitly queued 1999-03-02 09:44:33 10HmaX-0005vi-00 => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer +1999-03-02 09:44:33 10HmaY-0005vi-00 == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer 1999-03-02 09:44:33 10HmaY-0005vi-00 => ok@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1]* C="250 OK" diff --git a/test/log/0343 b/test/log/0343 index d34ba97ed..fb2f466a4 100644 --- a/test/log/0343 +++ b/test/log/0343 @@ -1,4 +1,4 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (dd): Connection refused -1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (-53): retry time not reached for any host for 'y' +1999-03-02 09:44:33 10HmaX-0005vi-00 == x@y R=all T=remote_smtp defer (-54): retry time not reached for any host for 'y' diff --git a/test/log/0357 b/test/log/0357 index 4a4ed55cd..4e52b844a 100644 --- a/test/log/0357 +++ b/test/log/0357 @@ -7,5 +7,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == 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:: 451 Temporary error 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0476 b/test/log/0476 index 07db42b6d..41cf8980c 100644 --- a/test/log/0476 +++ b/test/log/0476 @@ -8,5 +8,5 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 10HmaZ-0005vi-00 == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host for 'test.ex' +1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex' 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0529 b/test/log/0529 index 2e56375ce..1d46bf8ef 100644 --- a/test/log/0529 +++ b/test/log/0529 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 == TESTSUITE/test-mail/rmbox R=r1 T=t1 defer (-22): mailbox is full (MTA-imposed quota exceeded while writing to TESTSUITE/test-mail/rmbox) 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == TESTSUITE/test-mail/rmbox R=r1 T=t1 defer (-52): Retry time not yet reached +1999-03-02 09:44:33 10HmaX-0005vi-00 == TESTSUITE/test-mail/rmbox R=r1 T=t1 defer (-53): Retry time not yet reached 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0543 b/test/log/0543 index bce32c568..7d33956cb 100644 --- a/test/log/0543 +++ b/test/log/0543 @@ -5,5 +5,5 @@ 1999-03-02 09:44:33 Start queue run: pid=pppp 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed -1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaY-0005vi-00 == usery@domain1 routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0570 b/test/log/0570 index 215cc89a4..5cc32a94e 100644 --- a/test/log/0570 +++ b/test/log/0570 @@ -12,7 +12,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbB-0005vi-00 == usery@domf.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbB-0005vi-00 == usery@domf.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbB-0005vi-00 => userx@dome.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -qf @@ -27,7 +27,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbG-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbG-0005vi-00 == usery@doml.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbG-0005vi-00 == usery@doml.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbG-0005vi-00 => userx@domk.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbH-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -qf @@ -36,7 +36,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmbJ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbJ-0005vi-00 == usery@domn.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbJ-0005vi-00 == usery@domn.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbJ-0005vi-00 => userx@domm.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbK-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 Start queue run: pid=pppp -qf @@ -45,7 +45,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp -qf 1999-03-02 09:44:33 10HmbM-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbM-0005vi-00 == userz@domq.ex R=all T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbM-0005vi-00 == userz@domq.ex R=all T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbM-0005vi-00 => userx@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" 1999-03-02 09:44:33 10HmbM-0005vi-00 -> usery@domp.ex R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbN-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp diff --git a/test/log/0611 b/test/log/0611 index f6b206d45..003e7c045 100644 --- a/test/log/0611 +++ b/test/log/0611 @@ -1,6 +1,6 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for a b c 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmaX-0005vi-00 == c@test.ex R=rmt_client T=smtp defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmaX-0005vi-00 == c@test.ex R=rmt_client T=smtp defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmaX-0005vi-00 => a@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaY-0005vi-00" 1999-03-02 09:44:33 10HmaX-0005vi-00 => b@test.ex R=rmt_client T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" 1999-03-02 09:44:33 End queue run: pid=pppp @@ -10,7 +10,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for y 1999-03-02 09:44:33 10HmbC-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss for z -1999-03-02 09:44:33 10HmbC-0005vi-00 == z@test.ex R=lcl_client T=pipe defer (-56): concurrency limit reached for transport +1999-03-02 09:44:33 10HmbC-0005vi-00 == z@test.ex R=lcl_client T=pipe defer (-57): concurrency limit reached for transport 1999-03-02 09:44:33 10HmbB-0005vi-00 => y R=lcl_client T=pipe 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed 1999-03-02 09:44:33 Start queue run: pid=pppp diff --git a/test/log/0618 b/test/log/0618 index ad992d9a2..0c818aed2 100644 --- a/test/log/0618 +++ b/test/log/0618 @@ -45,7 +45,7 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 defer/never 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbC-0005vi-00 event tcp:connect 1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:connect 1999-03-02 09:44:33 10HmbC-0005vi-00 event smtp:ehlo @@ -56,9 +56,9 @@ 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 playout 1999-03-02 09:44:33 Start queue run: pid=pppp -1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbB-0005vi-00 == rmt_defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbD-0005vi-00 <= <> R=10HmbB-0005vi-00 U=EXIMUSER P=local S=sss for c@dump.ex -1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmbC-0005vi-00 == rmt_defer@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:fail:internal 1999-03-02 09:44:33 10HmbB-0005vi-00 event msg:complete diff --git a/test/log/3206 b/test/log/3206 index 08a966eaf..3fa49ae82 100644 --- a/test/log/3206 +++ b/test/log/3206 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 == c@hold.remote.ex defer (-23): domain is held 1999-03-02 09:44:33 10HmaX-0005vi-00 == d@hold2.remote.ex defer (-35): hold_domains lookup deferred 1999-03-02 09:44:33 10HmaX-0005vi-00 == f@queue2.go.remote.ex routing defer (-35): queue_domains lookup deferred -1999-03-02 09:44:33 10HmaX-0005vi-00 == e@queue.go.remote.ex routing defer (-55): domain is in queue_domains +1999-03-02 09:44:33 10HmaX-0005vi-00 == e@queue.go.remote.ex routing defer (-56): domain is in queue_domains 1999-03-02 09:44:33 10HmaX-0005vi-00 => a R=all T=local_delivery diff --git a/test/log/5510 b/test/log/5510 index fa2e79d19..45faaf22e 100644 --- a/test/log/5510 +++ b/test/log/5510 @@ -13,7 +13,7 @@ 1999-03-02 09:44:33 10HmbA-0005vi-00 => userp@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1] PRDR C="250 first rcpt was good\\n250 OK, overall" 1999-03-02 09:44:33 10HmbA-0005vi-00 ** userq@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: PRDR error after DATA: 550 second rcpt does not like content 1999-03-02 09:44:33 10HmbA-0005vi-00 Frozen (delivery error message) -1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@test.ex routing defer (-51): retry time not reached +1999-03-02 09:44:33 10HmaZ-0005vi-00 == userz@test.ex routing defer (-52): retry time not reached 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.1@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection 1999-03-02 09:44:33 10HmbB-0005vi-00 ** user5.2@test.ex R=r0 T=t1 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 550 oops, overall rejection diff --git a/test/log/5707 b/test/log/5707 index 643dad214..2f45173d6 100644 --- a/test/log/5707 +++ b/test/log/5707 @@ -1,4 +1,4 @@ 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 10HmaX-0005vi-00 Denying tcp connection 1999-03-02 09:44:33 10HmaX-0005vi-00 H=127.0.0.1 [127.0.0.1] Event requests alternate response -1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-57) +1999-03-02 09:44:33 10HmaX-0005vi-00 == userx@domain1 R=others T=smtp defer (-58) diff --git a/test/msglog/0197.10HmaY-0005vi-00 b/test/msglog/0197.10HmaY-0005vi-00 index 1f4de1777..ccb2e78a6 100644 --- a/test/msglog/0197.10HmaY-0005vi-00 +++ b/test/msglog/0197.10HmaY-0005vi-00 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 Received from doesn't@matter U=CALLER P=local-smtp S=sss 1999-03-02 09:44:33 x@copy.domain : makecopy transport succeeded 1999-03-02 09:44:33 y@copy.domain : makecopy transport succeeded -1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host for 'copy.domain' -1999-03-02 09:44:33 y@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host for 'copy.domain' -1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host for 'elsewhere' +1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' +1999-03-02 09:44:33 y@copy.domain R=passall T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' +1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (-54): retry time not reached for any host for 'elsewhere' 1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 y@copy.domain R=passall T=pass_on defer (dd): Network Error diff --git a/test/msglog/0198.10HmaZ-0005vi-00 b/test/msglog/0198.10HmaZ-0005vi-00 index d9cbe5344..a4521da0d 100644 --- a/test/msglog/0198.10HmaZ-0005vi-00 +++ b/test/msglog/0198.10HmaZ-0005vi-00 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 Received from <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 CALLER@the.local.host.name R=passall T=pass_on defer (-53): retry time not reached for any host for 'the.local.host.name' +1999-03-02 09:44:33 CALLER@the.local.host.name R=passall T=pass_on defer (-54): retry time not reached for any host for 'the.local.host.name' diff --git a/test/msglog/0198.10HmbA-0005vi-00 b/test/msglog/0198.10HmbA-0005vi-00 index 6907a33df..a71ed863d 100644 --- a/test/msglog/0198.10HmbA-0005vi-00 +++ b/test/msglog/0198.10HmbA-0005vi-00 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 Received from doesn't@matter U=CALLER P=local-bsmtp S=sss id=E10HmbB-0005vi-00@the.local.host.name 1999-03-02 09:44:33 routing failed for y@copy.domain: Unrouteable address -1999-03-02 09:44:33 x@copy.domain R=check_file T=pass_on defer (-53): retry time not reached for any host for 'copy.domain' +1999-03-02 09:44:33 x@copy.domain R=check_file T=pass_on defer (-54): retry time not reached for any host for 'copy.domain' diff --git a/test/msglog/0198.10HmbC-0005vi-00 b/test/msglog/0198.10HmbC-0005vi-00 index 1c2aeee3e..d26649790 100644 --- a/test/msglog/0198.10HmbC-0005vi-00 +++ b/test/msglog/0198.10HmbC-0005vi-00 @@ -1,2 +1,2 @@ 1999-03-02 09:44:33 Received from <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss -1999-03-02 09:44:33 doesn't@matter R=passall T=pass_on defer (-53): retry time not reached for any host for 'matter' +1999-03-02 09:44:33 doesn't@matter R=passall T=pass_on defer (-54): retry time not reached for any host for 'matter' diff --git a/test/stderr/0055 b/test/stderr/0055 index e3789a44c..81c1e7f09 100644 --- a/test/stderr/0055 +++ b/test/stderr/0055 @@ -16,7 +16,7 @@ LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss delivering 10HmaZ-0005vi-00 LOG: retry_defer MAIN - == xxx@local.test.ex routing defer (-55): domain is in queue_domains + == xxx@local.test.ex routing defer (-56): domain is in queue_domains LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss delivering 10HmbB-0005vi-00 @@ -68,7 +68,7 @@ LOG: MAIN <= CALLER@myhost.ex U=CALLER P=local S=sss delivering 10HmbG-0005vi-00 LOG: retry_defer MAIN - == xxx@local.test.ex routing defer (-55): domain is in queue_domains + == xxx@local.test.ex routing defer (-56): domain is in queue_domains delivering 10HmbG-0005vi-00 LOG: MAIN *> xxx@local.test.ex R=localreally T=local_delivery diff --git a/test/stderr/0332 b/test/stderr/0332 index c76dade30..9c5700ca9 100644 --- a/test/stderr/0332 +++ b/test/stderr/0332 @@ -49,7 +49,7 @@ locking TESTSUITE/spool/db/retry.lockfile Considering: delay@test.again.dns unique = delay@test.again.dns LOG: retry_defer MAIN - == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer + == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ok@no.delay unique = ok@no.delay @@ -88,7 +88,7 @@ locking TESTSUITE/spool/db/retry.lockfile Considering: delay@test.again.dns unique = delay@test.again.dns LOG: retry_defer MAIN - == delay@test.again.dns routing defer (-51): retry time not reached + == delay@test.again.dns routing defer (-52): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: diff --git a/test/stderr/0333 b/test/stderr/0333 index 6e3b8e1c7..409bef41c 100644 --- a/test/stderr/0333 +++ b/test/stderr/0333 @@ -47,7 +47,7 @@ locking TESTSUITE/spool/db/retry.lockfile Considering: delay@test.again.dns unique = delay@test.again.dns LOG: retry_defer MAIN - == delay@test.again.dns routing defer (-51): reusing SMTP connection skips previous routing defer + == delay@test.again.dns routing defer (-52): reusing SMTP connection skips previous routing defer >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: ok@no.delay unique = ok@no.delay diff --git a/test/stderr/0357 b/test/stderr/0357 index 563146702..53ecffabe 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -173,7 +173,7 @@ retry time not reached: checking ultimate address timeout now=tttt first_failed=tttt next_try=tttt expired=F received_time=tttt diff=tttt timeout=3600 LOG: retry_defer MAIN - == userx@test.ex routing defer (-51): retry time not reached + == userx@test.ex routing defer (-52): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: diff --git a/test/stderr/0476 b/test/stderr/0476 index 69ab06b88..d3daf9275 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -126,7 +126,7 @@ set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp) set_process_info: pppp delivering 10HmaY-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaY-0005vi-00 LOG: retry_defer MAIN - == usery@test.ex R=r1 T=t1 defer (-53): retry time not reached for any host for 'test.ex' + == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex' set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp diff --git a/test/stderr/0529 b/test/stderr/0529 index 824512060..0ceaeb8e6 100644 --- a/test/stderr/0529 +++ b/test/stderr/0529 @@ -75,7 +75,7 @@ retry time not reached: checking ultimate address timeout now=tttt first_failed=tttt next_try=tttt expired=F received_time=tttt diff=tttt timeout=259200 LOG: retry_defer MAIN - == TESTSUITE/test-mail/rmbox R=r1 T=t1 defer (-52): Retry time not yet reached + == TESTSUITE/test-mail/rmbox R=r1 T=t1 defer (-53): Retry time not yet reached Processing retry items Succeeded addresses: x@test.ex: no retry items diff --git a/test/stderr/0543 b/test/stderr/0543 index 9619f9e33..4b0a69e6a 100644 --- a/test/stderr/0543 +++ b/test/stderr/0543 @@ -43,7 +43,7 @@ locking TESTSUITE/spool/db/retry.lockfile Considering: usery@domain1 unique = usery@domain1 LOG: retry_defer MAIN - == usery@domain1 routing defer (-51): retry time not reached + == usery@domain1 routing defer (-52): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> After routing: Local deliveries: -- 2.30.2