From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 26 Feb 2022 22:20:52 +0000 (+0100)
Subject: lib-master: Replace master_service_ssl_server_settings_get() with master_service_sett... 
X-Git-Tag: 2.4.0~3356
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bb17e47fdb52c7338b6dbfb753c9b5632e9dd1d;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Replace master_service_ssl_server_settings_get() with master_service_settings_get_root_set()
---

diff --git a/src/lib-master/master-service-ssl-settings.c b/src/lib-master/master-service-ssl-settings.c
index c66847e490..fcc06169e8 100644
--- a/src/lib-master/master-service-ssl-settings.c
+++ b/src/lib-master/master-service-ssl-settings.c
@@ -163,16 +163,6 @@ master_service_ssl_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 }
 /* </settings checks> */
 
-const struct master_service_ssl_server_settings *
-master_service_ssl_server_settings_get(struct master_service *service)
-{
-	void **sets;
-
-	i_assert(service->want_ssl_server);
-	sets = settings_parser_get_list(service->set_parser);
-	return sets[2];
-}
-
 static void master_service_ssl_common_settings_to_iostream_set(
 	const struct master_service_ssl_settings *ssl_set, pool_t pool,
 	struct ssl_iostream_settings *set_r)
diff --git a/src/lib-master/master-service-ssl-settings.h b/src/lib-master/master-service-ssl-settings.h
index bd1fd82b10..a1347df6ff 100644
--- a/src/lib-master/master-service-ssl-settings.h
+++ b/src/lib-master/master-service-ssl-settings.h
@@ -45,9 +45,6 @@ struct master_service_ssl_server_settings {
 extern const struct setting_parser_info master_service_ssl_setting_parser_info;
 extern const struct setting_parser_info master_service_ssl_server_setting_parser_info;
 
-const struct master_service_ssl_server_settings *
-master_service_ssl_server_settings_get(struct master_service *service);
-
 /* Provides master service ssl settings to iostream settings */
 void master_service_ssl_client_settings_to_iostream_set(
 	const struct master_service_ssl_settings *ssl_set, pool_t pool,
diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c
index 2d931f631d..8e9c90bf53 100644
--- a/src/lib-master/master-service-ssl.c
+++ b/src/lib-master/master-service-ssl.c
@@ -60,7 +60,8 @@ void master_service_ssl_ctx_init(struct master_service *service)
 
 	set = master_service_settings_get_root_set(service,
 			&master_service_ssl_setting_parser_info);
-	server_set = master_service_ssl_server_settings_get(service);
+	server_set = master_service_settings_get_root_set(service,
+			&master_service_ssl_server_setting_parser_info);
 	if (strcmp(set->ssl, "no") == 0) {
 		/* SSL disabled, don't use it */
 		return;