From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 29 Mar 2023 21:43:13 +0000 (+0300)
Subject: doveconf: Remove now unused -E parameter to disable settings checks
X-Git-Tag: 2.4.0~2192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8567fdf0fe09e35aa0935f73068c65b32ba5a4d7;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Remove now unused -E parameter to disable settings checks
---

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index bb086cb9dd..b329e1fe95 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -754,8 +754,6 @@ static int config_parse_finish(struct config_parser_context *ctx, const char **e
 
 	if (ret < 0)
 		;
-	else if (ctx->hide_errors)
-		ret = 0;
 	else if ((ret = config_all_parsers_check(ctx, new_filter, &error)) < 0) {
 		*error_r = t_strdup_printf("Error in configuration file %s: %s",
 					   ctx->path, error);
@@ -1024,8 +1022,6 @@ int config_parse_file(const char *path, enum config_parse_flags flags,
 	i_zero(&ctx);
 	ctx.pool = pool_alloconly_create(MEMPOOL_GROWING"config file parser", 1024*256);
 	ctx.path = path;
-	ctx.hide_errors = fd == -1 ||
-		(flags & CONFIG_PARSE_FLAG_HIDE_ERRORS) != 0;
 	ctx.delay_errors = (flags & CONFIG_PARSE_FLAG_DELAY_ERRORS) != 0;
 
 	for (count = 0; all_roots[count] != NULL; count++) ;
diff --git a/src/config/config-parser.h b/src/config/config-parser.h
index e2e787ba4a..ec63f12327 100644
--- a/src/config/config-parser.h
+++ b/src/config/config-parser.h
@@ -7,7 +7,6 @@
 
 enum config_parse_flags {
 	CONFIG_PARSE_FLAG_EXPAND_VALUES	= BIT(0),
-	CONFIG_PARSE_FLAG_HIDE_ERRORS	= BIT(1),
 	CONFIG_PARSE_FLAG_DELAY_ERRORS  = BIT(3),
 };
 
diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index 821c120998..25738cc465 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -873,7 +873,6 @@ int main(int argc, char *argv[])
 	bool simple_output = FALSE;
 	bool dump_defaults = FALSE, host_verify = FALSE, dump_full = FALSE;
 	bool print_plugin_banner = FALSE, hide_passwords = TRUE;
-	bool disable_check_settings = FALSE;
 
 	if (getenv("USE_SYSEXITS") != NULL) {
 		/* we're coming from (e.g.) LDA */
@@ -882,7 +881,7 @@ int main(int argc, char *argv[])
 
 	i_zero(&filter);
 	master_service = master_service_init("config", master_service_flags,
-					     &argc, &argv, "adEf:FhHm:nNpPexsS");
+					     &argc, &argv, "adf:FhHm:nNpPexsS");
 	orig_config_path = t_strdup(master_service_get_config_path(master_service));
 
 	i_set_failure_prefix("doveconf: ");
@@ -893,9 +892,6 @@ int main(int argc, char *argv[])
 		case 'd':
 			dump_defaults = TRUE;
 			break;
-		case 'E':
-			disable_check_settings = TRUE;
-			break;
 		case 'f':
 			filter_parse_arg(&filter, optarg);
 			break;
@@ -978,8 +974,6 @@ int main(int argc, char *argv[])
 	enum config_parse_flags flags = 0;
 	if (expand_vars)
 		flags |= CONFIG_PARSE_FLAG_EXPAND_VALUES;
-	if (disable_check_settings)
-		flags |= CONFIG_PARSE_FLAG_HIDE_ERRORS;
 	if (dump_full && exec_args != NULL)
 		flags |= CONFIG_PARSE_FLAG_DELAY_ERRORS;
 	if ((ret = config_parse_file(dump_defaults ? NULL : config_path,
@@ -992,8 +986,7 @@ int main(int argc, char *argv[])
 	if ((ret == -1 && exec_args != NULL) || ret == 0 || ret == -2)
 		i_fatal("%s", error);
 
-	enum config_dump_flags dump_flags = disable_check_settings ? 0 :
-		CONFIG_DUMP_FLAG_CHECK_SETTINGS;
+	enum config_dump_flags dump_flags = CONFIG_DUMP_FLAG_CHECK_SETTINGS;
 	if (dump_full && exec_args == NULL) {
 		ret2 = config_dump_full(CONFIG_DUMP_FULL_DEST_STDOUT,
 					dump_flags,