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 ce19fc6cdc088b478163eac737d252159325b38f..c20208f80ee10945643c6050105b9e2900dcdf5e 100644 (file)
--- 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 165e8c8ac60f3f3afb2c6c603bacf3e2f11e95d9..879c40570b89fdc73ded54d1f3e2b03903863014 100644 (file)
--- 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 8c81e11c309bd412f265861ae833bf92b92c3028..809c0dd798dd530ae7328632c0e514eb5e95a7c5 100644 (file)
--- 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);