From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 5 Jan 2023 09:39:28 +0000 (+0200)
Subject: master: Remove service_list.service_set
X-Git-Tag: 2.4.0~2329
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e4d661a59704602571dce41ba93cf6171a39491;p=thirdparty%2Fdovecot%2Fcore.git

master: Remove service_list.service_set

Just use master_service_get_service_settings() on demand.
---

diff --git a/src/master/service-process.c b/src/master/service-process.c
index 0d708ba8d6..1e8894c84d 100644
--- a/src/master/service-process.c
+++ b/src/master/service-process.c
@@ -298,7 +298,7 @@ service_process_setup_environment(struct service *service, unsigned int uid,
 				  const char *hostdomain)
 {
 	const struct master_service_settings *service_set =
-		service->list->service_set;
+		master_service_get_service_settings(master_service);
 	master_service_env_clean();
 
 	env_put(MASTER_IS_PARENT_ENV, "1");
diff --git a/src/master/service.c b/src/master/service.c
index 0fb6e88d8f..e2f0a19c72 100644
--- a/src/master/service.c
+++ b/src/master/service.c
@@ -433,7 +433,6 @@ services_create_real(const struct master_settings *set, pool_t pool,
 	service_list->refcount = 1;
 	service_list->pool = pool;
 	service_list->event = event;
-	service_list->service_set = master_service_get_service_settings(master_service);
 	service_list->set_pool = master_service_settings_detach(master_service);
 	service_list->set = set;
 	service_list->master_log_fd[0] = -1;
@@ -658,14 +657,15 @@ static void services_kill_timeout(struct service_list *service_list)
 
 void services_destroy(struct service_list *service_list, bool wait)
 {
+	const struct master_service_settings *service_set =
+		master_service_get_service_settings(master_service);
 	/* make sure we log if child processes died unexpectedly */
 	service_list->destroying = TRUE;
 	services_monitor_reap_children();
 
 	services_monitor_stop(service_list, wait);
 
-	if (service_list->refcount > 1 &&
-	    service_list->service_set->shutdown_clients) {
+	if (service_list->refcount > 1 && service_set->shutdown_clients) {
 		service_list->to_kill =
 			timeout_add(SERVICE_DIE_TIMEOUT_MSECS,
 				    services_kill_timeout, service_list);
diff --git a/src/master/service.h b/src/master/service.h
index 1cd6e3cfbd..36b3ec9866 100644
--- a/src/master/service.h
+++ b/src/master/service.h
@@ -152,7 +152,6 @@ struct service_list {
 	struct event *event;
 
 	const struct master_settings *set;
-	const struct master_service_settings *service_set;
 
 	struct service *config;
 	struct service *log;