From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 26 Feb 2022 22:04:37 +0000 (+0100)
Subject: global: Use master_service_settings_get_root_set_dup()
X-Git-Tag: 2.4.0~3359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d243ba86ea6654ec3f53bff3893daa28ecf105df;p=thirdparty%2Fdovecot%2Fcore.git

global: Use master_service_settings_get_root_set_dup()
---

diff --git a/src/doveadm/client-connection.c b/src/doveadm/client-connection.c
index 37dbb06744..aca3ffe639 100644
--- a/src/doveadm/client-connection.c
+++ b/src/doveadm/client-connection.c
@@ -39,7 +39,6 @@ static int client_connection_read_settings(struct client_connection *conn)
 	struct master_service_settings_input input;
 	struct master_service_settings_output output;
 	const char *error;
-	void *set;
 
 	i_zero(&input);
 	input.roots = set_roots;
@@ -52,9 +51,8 @@ static int client_connection_read_settings(struct client_connection *conn)
 		e_error(conn->event, "Error reading configuration: %s", error);
 		return -1;
 	}
-	set = master_service_settings_get_root_set(master_service,
-				&doveadm_setting_parser_info);
-	conn->set = settings_dup(&doveadm_setting_parser_info, set, conn->pool);
+	conn->set = master_service_settings_get_root_set_dup(master_service,
+				&doveadm_setting_parser_info, conn->pool);
 	return 0;
 }
 
diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 4069b3e952..d75c6218d4 100644
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -283,7 +283,6 @@ static void main_init(void)
 	const struct setting_parser_info *user_info;
 	const struct setting_parser_context *set_parser;
 	const struct mail_user_settings *user_set;
-	const struct quota_status_settings *set;
 	const char *value, *error;
 	pool_t pool;
 
@@ -308,11 +307,10 @@ static void main_init(void)
 		i_fatal("%s", error);
 	user_set = settings_parser_get_root_set(set_parser,
 			&mail_user_setting_parser_info);
-	set = master_service_settings_get_root_set(master_service,
-				&quota_status_setting_parser_info);
+	quota_status_settings = master_service_settings_get_root_set_dup(
+		master_service, &quota_status_setting_parser_info,
+		quota_status_pool);
 
-	quota_status_settings = settings_dup(&quota_status_setting_parser_info, set,
-					     quota_status_pool);
 	value = mail_user_set_plugin_getenv(user_set, "quota_status_nouser");
 	nouser_reply = p_strdup(quota_status_pool,
 				value != NULL ? value : "REJECT Unknown user");