Allow "retry timeout exceeded" and a couple of other similar messages to

appear in bounce messages (the default nowadays is not to give details).

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 36d3e4bbf04962bc043c2ab845e5e243d99e87b4..0b4f6ed123142a7d163a10b09b2b782398a1c6a1 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.178 2005/06/28 20:50:56 steve Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.179 2005/06/29 14:17:01 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -160,8 +160,9 @@ PH/20 Added macros for time_t as for off_t (see PH/15 above) and used them to
       "%lld" and "long long". Replaced the call to snprintf() with a call to
       string_vformat().
 
-PH/21 Added another message to those in 4.51/PH/42, namely "All relevant MX
-      records point to non-existent hosts".
+PH/21 Added some other messages to those in 4.51/PH/42, namely "All relevant MX
+      records point to non-existent hosts", "retry timeout exceeded", and
+      "retry time not reached for any host after a long failure period".
 
 PH/22 Fixed some oversights/typos causing bugs when Exim is compiled with
       experimental DomainKeys support:

diff --git a/src/src/retry.c b/src/src/retry.c
index 9c90f6699affcad795beafeaf21d87dce35da546..2e743a793532e8bcb11c966c4ef4b1c06dfcb18e 100644 (file)
--- 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 a78966430b3db9ab7ba39fbc865ff79a274ec957..dd6f3089bcb5d11e0effb5bb72759af633558506 100644 (file)
--- 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 "