dovecot-2.1: ssl_parameters_regenerate setting is now "time" typ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/ed9f4e03c2f9
changeset: 13812:ed9f4e03c2f9
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Dec 08 05:12:12 2011 +0200
description:
ssl_parameters_regenerate setting is now "time" type, as it should have been.

diffstat:

 src/config/old-set-parser.c          |  6 ++++++
 src/ssl-params/ssl-params-settings.c |  4 ++--
 src/ssl-params/ssl-params.c          |  2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r 55a70ae49cb7 -r ed9f4e03c2f9 src/config/old-set-parser.c
--- a/src/config/old-set-parser.c	Thu Dec 08 05:05:57 2011 +0200
+++ b/src/config/old-set-parser.c	Thu Dec 08 05:12:12 2011 +0200
@@ -140,6 +140,12 @@
 		set_rename(ctx, key, "ssl", value);
 		return TRUE;
 	}
+	if (strcmp(key, "ssl_parameters_regenerate") == 0 &&
+	    str_is_numeric(value, '\0')) {
+		obsolete(ctx, "%s should have 'hours' suffix", key);
+		config_apply_line(ctx, "", t_strconcat(key, "=", value, "h", NULL), NULL);
+		return TRUE;
+	}
 	if (strcmp(key, "sieve") == 0 ||
 	    strcmp(key, "sieve_storage") == 0) {
 		if (strcmp(key, "sieve_storage") == 0)
diff -r 55a70ae49cb7 -r ed9f4e03c2f9 src/ssl-params/ssl-params-settings.c
--- a/src/ssl-params/ssl-params-settings.c	Thu Dec 08 05:05:57 2011 +0200
+++ b/src/ssl-params/ssl-params-settings.c	Thu Dec 08 05:12:12 2011 +0200
@@ -58,13 +58,13 @@
 	{ type, #name, offsetof(struct ssl_params_settings, name), NULL }
 
 static const struct setting_define ssl_params_setting_defines[] = {
-	DEF(SET_UINT, ssl_parameters_regenerate),
+	DEF(SET_TIME, ssl_parameters_regenerate),
 
 	SETTING_DEFINE_LIST_END
 };
 
 static const struct ssl_params_settings ssl_params_default_settings = {
-	.ssl_parameters_regenerate = 24*7
+	.ssl_parameters_regenerate = 3600*24*7
 };
 
 const struct setting_parser_info ssl_params_setting_parser_info = {
diff -r 55a70ae49cb7 -r ed9f4e03c2f9 src/ssl-params/ssl-params.c
--- a/src/ssl-params/ssl-params.c	Thu Dec 08 05:05:57 2011 +0200
+++ b/src/ssl-params/ssl-params.c	Thu Dec 08 05:12:12 2011 +0200
@@ -137,7 +137,7 @@
 		return;
 
 	next_rebuild = param->last_mtime +
-		param->set.ssl_parameters_regenerate * 3600;
+		param->set.ssl_parameters_regenerate;
 
 	if (ioloop_time >= next_rebuild) {
 		ssl_params_rebuild(param);