From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 16 Jun 2023 14:11:22 +0000 (+0300)
Subject: lib-master: Remove unused master_service.ssl_ctx_initialized
X-Git-Tag: 2.4.1~1479
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1054f4ec5efb2bee2e51d93dff0453e864e00f7b;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Remove unused master_service.ssl_ctx_initialized

master_service_ssl_ctx_init() is called only once at startup, so there is no
need to support calling it multiple times.
---

diff --git a/src/lib-master/master-service-private.h b/src/lib-master/master-service-private.h
index f7be0958c4..5a20d85e85 100644
--- a/src/lib-master/master-service-private.h
+++ b/src/lib-master/master-service-private.h
@@ -99,7 +99,6 @@ struct master_service {
 	bool config_path_changed_with_param:1;
 	bool have_admin_sockets:1;
 	bool want_ssl_server:1;
-	bool ssl_ctx_initialized:1;
 	bool config_path_from_master:1;
 	bool log_initialized:1;
 	bool init_finished:1;
diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c
index 8dd3098b56..bf4063f2aa 100644
--- a/src/lib-master/master-service-ssl.c
+++ b/src/lib-master/master-service-ssl.c
@@ -18,10 +18,6 @@ void master_service_ssl_ctx_init(struct master_service *service)
 	const struct ssl_iostream_settings *ssl_set;
 	const char *error;
 
-	if (service->ssl_ctx_initialized)
-		return;
-	service->ssl_ctx_initialized = TRUE;
-
 	/* must be called after master_service_init_finish() so that if
 	   initialization fails we can close the SSL listeners */
 	i_assert(service->listeners != NULL || service->socket_count == 0);
@@ -59,5 +55,4 @@ void master_service_ssl_ctx_deinit(struct master_service *service)
 {
 	if (service->ssl_ctx != NULL)
 		ssl_iostream_context_unref(&service->ssl_ctx);
-	service->ssl_ctx_initialized = FALSE;
 }