From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 17 Nov 2022 14:16:02 +0000 (+0200)
Subject: lmtp: Remove client.user_set
X-Git-Tag: 2.4.0~3362
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78fbc6a61fd93d1de3e1272651322dd01635b365;p=thirdparty%2Fdovecot%2Fcore.git

lmtp: Remove client.user_set
---

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index e0f8fc5c47..103e4cf4ff 100644
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -111,7 +111,6 @@ static void client_read_settings(struct client *client, bool ssl)
 {
 	struct mail_storage_service_input input;
 	const struct setting_parser_context *set_parser;
-	struct mail_user_settings *user_set;
 	struct lmtp_settings *lmtp_set;
 	struct lda_settings *lda_set;
 	const char *error;
@@ -131,15 +130,13 @@ static void client_read_settings(struct client *client, bool ssl)
 					       &set_parser, &error) < 0)
 		i_fatal("%s", error);
 
-	lmtp_settings_dup(set_parser, client->pool,
-			  &user_set, &lmtp_set, &lda_set);
+	lmtp_settings_dup(set_parser, client->pool, &lmtp_set, &lda_set);
 	const struct var_expand_table *tab =
 		mail_storage_service_get_var_expand_table(storage_service, &input);
 	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_settings_get(master_service);
-	client->user_set = user_set;
 	client->lmtp_set = lmtp_set;
 	client->unexpanded_lda_set = lda_set;
 }
diff --git a/src/lmtp/lmtp-client.h b/src/lmtp/lmtp-client.h
index 43e592c7a7..26c2493834 100644
--- a/src/lmtp/lmtp-client.h
+++ b/src/lmtp/lmtp-client.h
@@ -74,7 +74,6 @@ struct client {
 	struct event *event;
 
 	const struct setting_parser_info *user_set_info;
-	const struct mail_user_settings *user_set;
 	const struct lda_settings *unexpanded_lda_set;
 	const struct lmtp_settings *lmtp_set;
 	const struct master_service_settings *service_set;
diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index bc8a69fd2b..7405b1f18b 100644
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -188,16 +188,11 @@ static bool lmtp_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 
 void lmtp_settings_dup(const struct setting_parser_context *set_parser,
 		       pool_t pool,
-		       struct mail_user_settings **user_set_r,
 		       struct lmtp_settings **lmtp_set_r,
 		       struct lda_settings **lda_set_r)
 {
 	const char *error;
 
-	*user_set_r = settings_parser_get_root_set(set_parser,
-				&mail_user_setting_parser_info);
-	*user_set_r = settings_dup(&mail_user_setting_parser_info,
-				   *user_set_r, pool);
 	*lda_set_r = settings_parser_get_root_set(set_parser,
 				&lda_setting_parser_info);
 	*lda_set_r = settings_dup(&lda_setting_parser_info,
diff --git a/src/lmtp/lmtp-settings.h b/src/lmtp/lmtp-settings.h
index 3b2eaa3380..37cfba499e 100644
--- a/src/lmtp/lmtp-settings.h
+++ b/src/lmtp/lmtp-settings.h
@@ -46,7 +46,6 @@ extern const struct setting_parser_info lmtp_setting_parser_info;
 
 void lmtp_settings_dup(const struct setting_parser_context *set_parser,
 		       pool_t pool,
-		       struct mail_user_settings **user_set_r,
 		       struct lmtp_settings **lmtp_set_r,
 		       struct lda_settings **lda_set_r);