ph10 2006/02/22 15:08:20 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src/src readconf.c
exim-test/confs 0001
exim-test/scripts/0000-Basic 0001
exim-test/stdout 0001
Log:
Limit retry_interval_max to 24h to avoid overflow problems.
Revision Changes Path
1.311 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.89 +5 -0 exim/exim-doc/doc-txt/NewStuff
1.21 +4 -0 exim/exim-src/src/readconf.c
1.2 +1 -1 exim/exim-test/confs/0001
1.2 +1 -0 exim/exim-test/scripts/0000-Basic/0001
1.2 +1 -0 exim/exim-test/stdout/0001
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -r1.310 -r1.311
--- ChangeLog 22 Feb 2006 14:46:44 -0000 1.310
+++ ChangeLog 22 Feb 2006 15:08:20 -0000 1.311
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.310 2006/02/22 14:46:44 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -220,6 +220,10 @@
argument. It sets umask(777), creates the file, chmods it to the required
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
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- NewStuff 21 Feb 2006 16:24:19 -0000 1.88
+++ NewStuff 22 Feb 2006 15:08:20 -0000 1.89
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.88 2006/02/21 16:24:19 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.89 2006/02/22 15:08:20 ph10 Exp $
New Features in Exim
--------------------
@@ -68,6 +68,11 @@
when a pipe transport is run to perform a delivery. The limits for the
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
Index: readconf.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/readconf.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- readconf.c 16 Feb 2006 14:54:15 -0000 1.20
+++ readconf.c 22 Feb 2006 15:08:20 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/readconf.c,v 1.20 2006/02/16 14:54:15 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/readconf.c,v 1.21 2006/02/22 15:08:20 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2818,6 +2818,10 @@
wanted. */
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 */
Index: 0001
===================================================================
RCS file: /home/cvs/exim/exim-test/confs/0001,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001 7 Feb 2006 10:34:25 -0000 1.1
+++ 0001 22 Feb 2006 15:08:20 -0000 1.2
@@ -158,7 +158,7 @@
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
Index: 0001
===================================================================
RCS file: /home/cvs/exim/exim-test/scripts/0000-Basic/0001,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001 7 Feb 2006 10:54:33 -0000 1.1
+++ 0001 22 Feb 2006 15:08:20 -0000 1.2
@@ -20,6 +20,7 @@
never_users \
percent_hack_domains \
qualify_domain \
+ retry_interval_max \
receive_timeout \
sender_unqualified_hosts \
tcp_nodelay \
Index: 0001
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0001,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 0001 7 Feb 2006 10:47:37 -0000 1.1
+++ 0001 22 Feb 2006 15:08:20 -0000 1.2
@@ -13,6 +13,7 @@
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
