Limit retry_interval_max to 24h to avoid overflow problems.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 6385f60def9564cfebbdfa7a94cb6abb2c3bea44..76448517565d380dea802d259dd2a8e30ce7c186 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.310 2006/02/22 14:46:44 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.311 2006/02/22 15:08:20 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -221,6 +221,10 @@ PH/42 The content-scanning code uses fopen() to create files in which to put
       mode, then resets the umask. All the relevant calls to fopen() in the
       content scanning code have been changed to use this function.
 
       mode, then resets the umask. All the relevant calls to fopen() in the
       content scanning code have been changed to use this function.
 

+PH/43 If retry_interval_max is set greater than 24 hours, it is quietly reset
+      to 24 hours. This avoids potential overflow problems when processing G
+      and H retry rules. I suspect nobody ever tinkers with this value.
+

 
 Exim version 4.60
 -----------------
 
 Exim version 4.60
 -----------------

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 7627fb7f9b517cb68ae8757e3edac8847731becf..14e08ee7893053e850a6f17abe2389d7bd3632fc 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.88 2006/02/21 16:24:19 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.89 2006/02/22 15:08:20 ph10 Exp $

 
 New Features in Exim
 --------------------
 
 New Features in Exim
 --------------------


@@ -69,6 +69,11 @@ PH/10 When compiled on FreeBSD, NetBSD, or BSD/OS, the pipe transport has a new
       uid under which the pipe is to run are obtained from the login class
       database.
 
       uid under which the pipe is to run are obtained from the login class
       database.
 

+PH/11 If retry_interval_max is set greater than 24 hours, it is quietly reset
+      to 24 hours. This avoids potential overflow problems when processing G
+      and H retry rules, and it seems reasonable to require a retry at least
+      once a day.
+

 
 Version 4.60
 ------------
 
 Version 4.60
 ------------

diff --git a/src/src/readconf.c b/src/src/readconf.c
index 37df2464e98b6cc5edbd4d9a7a108aa460176d40..59e75d0a4c00f1a0c38742a570ea503578abc80d 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/readconf.c,v 1.20 2006/02/16 14:54:15 ph10 Exp $ */
+/* $Cambridge: exim/src/src/readconf.c,v 1.21 2006/02/22 15:08:20 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -2819,6 +2819,10 @@ wanted. */
 
 if (timezone_string != NULL && *timezone_string == 0) timezone_string = NULL;
 
 
 if (timezone_string != NULL && *timezone_string == 0) timezone_string = NULL;
 

+/* The max retry interval must not be greater than 24 hours. */
+
+if (retry_interval_max > 24*60*60) retry_interval_max = 24*60*60;
+

 /* remote_max_parallel must be > 0 */
 
 if (remote_max_parallel <= 0) remote_max_parallel = 1;
 /* remote_max_parallel must be > 0 */
 
 if (remote_max_parallel <= 0) remote_max_parallel = 1;

diff --git a/test/confs/0001 b/test/confs/0001
index 7f7fb4a1ead342fe06af3afdf8e805bb3ea84f4e..049cd1787bfafa8f77d8304e9005bacb20fcd8ee 100644 (file)
--- a/test/confs/0001
+++ b/test/confs/0001
@@ -158,7 +158,7 @@ no_recipients_max_reject
 remote_max_parallel = 1
 remote_sort_domains =
 retry_data_expire = 24h
 remote_max_parallel = 1
 remote_sort_domains =
 retry_data_expire = 24h

-retry_interval_max = 1d
+retry_interval_max = 3d

 return_path_remove
 rfc1413_hosts =
 sender_unqualified_hosts = localhost:some.host.name
 return_path_remove
 rfc1413_hosts =
 sender_unqualified_hosts = localhost:some.host.name

diff --git a/test/scripts/0000-Basic/0001 b/test/scripts/0000-Basic/0001
index 039c7a66839159e2bcbb73b19165e88ae8bb99f2..4b5f282cabb702f37a9b51efff848a3c0287cf8f 100644 (file)
--- a/test/scripts/0000-Basic/0001
+++ b/test/scripts/0000-Basic/0001
@@ -20,6 +20,7 @@ exim -bP accept_8bitmime \
          never_users \
          percent_hack_domains \
          qualify_domain \
          never_users \
          percent_hack_domains \
          qualify_domain \

+         retry_interval_max \ 

          receive_timeout \
          sender_unqualified_hosts \
          tcp_nodelay \
          receive_timeout \
          sender_unqualified_hosts \
          tcp_nodelay \

diff --git a/test/stdout/0001 b/test/stdout/0001
index 6d605f251efdd87c7fdaa8535f5779dc6f028571..77d2022287af2ac4d7ee677bb9019d12f8129a27 100644 (file)
--- a/test/stdout/0001
+++ b/test/stdout/0001
@@ -13,6 +13,7 @@ max_username_length = 8
 never_users = root:root
 percent_hack_domains = 
 qualify_domain = some.dom.ain
 never_users = root:root
 percent_hack_domains = 
 qualify_domain = some.dom.ain

+retry_interval_max = 1d

 receive_timeout = 0s
 sender_unqualified_hosts = localhost:some.host.name
 no_tcp_nodelay
 receive_timeout = 0s
 sender_unqualified_hosts = localhost:some.host.name
 no_tcp_nodelay