From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 29 Mar 2023 21:31:42 +0000 (+0300)
Subject: config: Remove kludge to skip SSL server settings with doveadm
X-Git-Tag: 2.4.0~2194
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03c11f33944f1105abcfe4aedc4e21d41c86564b;p=thirdparty%2Fdovecot%2Fcore.git

config: Remove kludge to skip SSL server settings with doveadm

The previous changes make this unnecessary. The SSL server setting read
failures are delayed until they are attempted to be used, but doveadm
won't actually try to use them.

Reverts 310f9fac3abe5e9889262bd679af67343c8b4af0
---

diff --git a/src/config/config-parser-private.h b/src/config/config-parser-private.h
index f24b69ca17..f3c6dcb3a4 100644
--- a/src/config/config-parser-private.h
+++ b/src/config/config-parser-private.h
@@ -60,7 +60,6 @@ struct config_parser_context {
 	bool expand_values:1;
 	bool hide_errors:1;
 	bool delay_errors:1;
-	bool skip_ssl_server_settings:1; /* FIXME: temporary kludge - remove later */
 };
 
 extern void (*hook_config_parser_begin)(struct config_parser_context *ctx);
diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index 78ebc95f81..bb086cb9dd 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -790,20 +790,6 @@ config_get_value(struct config_section_stack *section, const char *key,
 	return NULL;
 }
 
-static bool
-config_skip_key(struct config_parser_context *ctx, const char *key)
-{
-	if (ctx->skip_ssl_server_settings &&
-	    (strcmp(key, "ssl_cert") == 0 ||
-	     strcmp(key, "ssl_key") == 0 ||
-	     strcmp(key, "ssl_ca") == 0 ||
-	     strcmp(key, "ssl_verify_client_cert") == 0)) {
-		/* FIXME: temporary kludge - remove later */
-		return TRUE;
-	}
-	return FALSE;
-}
-
 static int config_write_keyvariable(struct config_parser_context *ctx,
 				    const char *key, const char *value,
 				    string_t *str)
@@ -951,8 +937,6 @@ void config_parser_apply_line(struct config_parser_context *ctx,
 	case CONFIG_LINE_TYPE_KEYVALUE:
 	case CONFIG_LINE_TYPE_KEYFILE:
 	case CONFIG_LINE_TYPE_KEYVARIABLE:
-		if (config_skip_key(ctx, key))
-			break;
 		str_append(ctx->str, key);
 		config_parser_check_warnings(ctx, key);
 		str_append_c(ctx->str, '=');
@@ -1043,8 +1027,6 @@ int config_parse_file(const char *path, enum config_parse_flags flags,
 	ctx.hide_errors = fd == -1 ||
 		(flags & CONFIG_PARSE_FLAG_HIDE_ERRORS) != 0;
 	ctx.delay_errors = (flags & CONFIG_PARSE_FLAG_DELAY_ERRORS) != 0;
-	ctx.skip_ssl_server_settings =
-		(flags & CONFIG_PARSE_FLAG_SKIP_SSL_SERVER) != 0;
 
 	for (count = 0; all_roots[count] != NULL; count++) ;
 	ctx.root_parsers =
diff --git a/src/config/config-parser.h b/src/config/config-parser.h
index a1d914b2bc..e2e787ba4a 100644
--- a/src/config/config-parser.h
+++ b/src/config/config-parser.h
@@ -8,7 +8,6 @@
 enum config_parse_flags {
 	CONFIG_PARSE_FLAG_EXPAND_VALUES	= BIT(0),
 	CONFIG_PARSE_FLAG_HIDE_ERRORS	= BIT(1),
-	CONFIG_PARSE_FLAG_SKIP_SSL_SERVER = BIT(2), /* FIXME: temporary kludge - remove later */
 	CONFIG_PARSE_FLAG_DELAY_ERRORS  = BIT(3),
 };
 
diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index dca8cddffd..821c120998 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -982,10 +982,6 @@ int main(int argc, char *argv[])
 		flags |= CONFIG_PARSE_FLAG_HIDE_ERRORS;
 	if (dump_full && exec_args != NULL)
 		flags |= CONFIG_PARSE_FLAG_DELAY_ERRORS;
-	if (null_strcmp(getenv("DOVECONF_SERVICE"), "doveadm") == 0) {
-		/* FIXME: temporary kludge - remove later */
-		flags |= CONFIG_PARSE_FLAG_SKIP_SSL_SERVER;
-	}
 	if ((ret = config_parse_file(dump_defaults ? NULL : config_path,
 				     flags, &error)) == 0 &&
 	    access(EXAMPLE_CONFIG_DIR, X_OK) == 0) {