From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 3 Apr 2023 11:22:44 +0000 (+0300)
Subject: config: old-set-parser - Merge "key is no longer needed" settings into "key has been... 
X-Git-Tag: 2.4.0~2247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e49a281d435f4bad5a39a6a6db3c6ffad3e923a;p=thirdparty%2Fdovecot%2Fcore.git

config: old-set-parser - Merge "key is no longer needed" settings into "key has been removed" settings

There's not much of a difference between these.
---

diff --git a/src/config/old-set-parser.c b/src/config/old-set-parser.c
index 242d6aa638..cf23236d0c 100644
--- a/src/config/old-set-parser.c
+++ b/src/config/old-set-parser.c
@@ -55,6 +55,8 @@ static const struct {
 	{ .key = "director_consistent_hashing", },
 	{ .key = "mail_log_max_lines_per_sec", },
 	{ .key = "maildir_copy_preserve_filename", },
+	{ .key = "ssl_parameters_regenerate", },
+	{ .key = "ssl_dh_parameters_length", },
 };
 
 static void ATTR_FORMAT(2, 3)
@@ -216,11 +218,6 @@ old_settings_handle_root(struct config_parser_context *ctx,
 		set_rename(ctx, key, "ssl", value);
 		return TRUE;
 	}
-	if (strcmp(key, "ssl_parameters_regenerate") == 0 ||
-	    strcmp(key, "ssl_dh_parameters_length") == 0) {
-		obsolete(ctx, "%s is no longer needed", key);
-		return TRUE;
-	}
 	if (strcmp(key, "ssl_protocols") == 0) {
 		obsolete(ctx, "%s has been replaced by ssl_min_protocol", key);
 		const char *min_protocol, *error;