From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 5 Jan 2023 12:07:56 +0000 (+0200)
Subject: lmtp: Remove client.service_set
X-Git-Tag: 2.4.0~2319
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a835f1f323d94b586c51d0315202c29f75f6218;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Remove client.service_set

Just use master_service_get_service_settings() on demand.
---

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index 96c009bbfe..05ce754c05 100644
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -130,7 +130,6 @@ static void client_read_settings(struct client *client, bool ssl)
 	if (settings_var_expand(&lmtp_setting_parser_info, lmtp_set,
 				client->pool, tab, &error) <= 0)
 		i_fatal("Failed to expand settings: %s", error);
-	client->service_set = master_service_get_service_settings(master_service);
 	client->lmtp_set = lmtp_set;
 	client->unexpanded_lda_set = lda_set;
 }
@@ -169,7 +168,7 @@ struct client *client_create(int fd_in, int fd_out,
 	client_load_modules(client);
 	client->my_domain = client->unexpanded_lda_set->hostname;
 
-	if (client->service_set->verbose_proctitle)
+	if (master_service_get_service_settings(master_service)->verbose_proctitle)
 		verbose_proctitle = TRUE;
 
 	p_array_init(&client->module_contexts, client->pool, 5);
diff --git a/src/lmtp/lmtp-client.h b/src/lmtp/lmtp-client.h
index 3c75eb8768..d7fbaf1218 100644
--- a/src/lmtp/lmtp-client.h
+++ b/src/lmtp/lmtp-client.h
@@ -75,7 +75,6 @@ struct client {
 
 	const struct lda_settings *unexpanded_lda_set;
 	const struct lmtp_settings *lmtp_set;
-	const struct master_service_settings *service_set;
 
 	struct smtp_server_connection *conn;