Restore legacy lock-* configuration statements.

* lib/libmf.h (config_cb_lock_retry_count)
(config_cb_lock_retry_timeout)
(mf_option_size_t,mf_init_lock_options): New prototypes.
* lib/optcache.c (mf_option_size_t): New function.
* lib/utils.c (config_cb_lock_retry_count)
(config_cb_lock_retry_timeout)
(mf_init_lock_options): New functions.
* src/main.c (mf_cfg_param): Restore lock-retry-count and
lock-retry-timeout for backward compatibility.
(main): Call mf_init_lock_options.
* src/mfdbtool.c (mfdbtool_cfg_param): Restore lock-retry-count and
lock-retry-timeout for backward compatibility.
(main): Call mf_init_lock_options.
* src/calloutd.c: Likewise.

* lib/close-fds.c (close_fds_except): Don't access FD_SET unless
i is less than FD_SETSIZE.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/main.c b/src/main.c
index b833a0c0..11a60aba 100644
--- a/src/main.c
+++ b/src/main.c
@@ -694,6 +694,7 @@ static const char *capa[] = {
 	"common",
 	"debug",
 	"logging",
+	"locking",
 	"mailer",
 	NULL
 };
@@ -918,10 +919,12 @@ struct mu_cfg_param mf_cfg_param[] = {
 
 	{ "database", mu_cfg_section, NULL },
 
-        { "lock-retry-count", mu_cfg_callback, 0, 0, config_cb_ignore,
-	  N_("Ignored for backward compatibility.") },
-	{ "lock-retry-timeout", mu_cfg_callback, 0,0, config_cb_ignore, 
-	  N_("Ignored for backward compatibility."),
+        { "lock-retry-count", mu_cfg_callback, NULL, 0,
+	  config_cb_lock_retry_count,
+	  N_("Retry acquiring DBM file lock this number of times.") },
+	{ "lock-retry-timeout", mu_cfg_callback, NULL, 0,
+	  config_cb_lock_retry_timeout,
+	  N_("Set the time span between the two DBM locking attempts."),
 	  N_("time") },
 
 	{ "max-match-mx", mu_cfg_size, &max_match_mx, 0, NULL,
@@ -1219,7 +1222,9 @@ main(int argc, char **argv)
 	db_format_setup();
 	include_path_setup();
 	pragma_setup();
+	mf_init_lock_options();
 	mf_optcache_add(option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC);
+	
 	mf_server_save_cmdline(argc, argv);
 
 	dnsbase_init();