From: Timo Sirainen <tss@iki.fi>
Date: Thu, 8 Dec 2011 03:12:12 +0000 (+0200)
Subject: ssl_parameters_regenerate setting is now "time" type, as it should have been.
X-Git-Tag: 2.1.rc2~88
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de84f428e20b57f98d2de9a3793e46e0e1560fb4;p=thirdparty%2Fdovecot%2Fcore.git

ssl_parameters_regenerate setting is now "time" type, as it should have been.
---

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index ce19fc6cdc..c20208f80e 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -140,6 +140,12 @@ old_settings_handle_root(struct config_parser_context *ctx,
 		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 --git a/src/ssl-params/ssl-params-settings.c b/src/ssl-params/ssl-params-settings.c
index 165e8c8ac6..879c40570b 100644
--- a/src/ssl-params/ssl-params-settings.c
+++ b/src/ssl-params/ssl-params-settings.c
@@ -58,13 +58,13 @@ struct service_settings ssl_params_service_settings = {
 	{ 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 --git a/src/ssl-params/ssl-params.c b/src/ssl-params/ssl-params.c
index 8c81e11c30..809c0dd798 100644
--- a/src/ssl-params/ssl-params.c
+++ b/src/ssl-params/ssl-params.c
@@ -137,7 +137,7 @@ static void ssl_params_set_timeout(struct ssl_params *param)
 		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);