diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-06-29 14:17:01 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-06-29 14:17:01 +0000 |
| commit | fffffe4c6b130334b949927ccdc0a36a7d880024 (patch) | |
| tree | ed678c40fa151b29104c74b781d86265ada1f604 /src | |
| parent | 885ccd3e0a1d03cd3139fba86edb62dc11617810 (diff) | |
Allow "retry timeout exceeded" and a couple of other similar messages to
appear in bounce messages (the default nowadays is not to give details).
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/retry.c | 5 | ||||
| -rw-r--r-- | src/src/transports/smtp.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/src/retry.c b/src/src/retry.c index 9c90f6699..2e743a793 100644 --- a/src/src/retry.c +++ b/src/src/retry.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/retry.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */ +/* $Cambridge: exim/src/src/retry.c,v 1.3 2005/06/29 14:17:01 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -842,6 +842,9 @@ for (i = 0; i < 3; i++) setflag(addr, af_retry_timedout); addr->message = (addr->message == NULL)? US"retry timeout exceeded" : string_sprintf("%s: retry timeout exceeded", addr->message); + addr->user_message = (addr->user_message == NULL)? + US"retry timeout exceeded" : + string_sprintf("%s: retry timeout exceeded", addr->user_message); log_write(0, LOG_MAIN, "** %s%s%s%s: retry timeout exceeded", addr->address, (addr->parent == NULL)? US"" : US" <", diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c index a78966430..dd6f3089b 100644 --- a/src/src/transports/smtp.c +++ b/src/src/transports/smtp.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/transports/smtp.c,v 1.12 2005/06/27 14:29:45 ph10 Exp $ */ +/* $Cambridge: exim/src/src/transports/smtp.c,v 1.13 2005/06/29 14:17:01 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -2788,6 +2788,7 @@ for (addr = addrlist; addr != NULL; addr = addr->next) } else if (expired) { + setflag(addr, af_pass_message); /* This is not a security risk */ addr->message = (ob->delay_after_cutoff)? US"retry time not reached for any host after a long failure period" : US"all hosts have been failing for a long time and were last tried " |