From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 12 Jan 2023 14:59:55 +0000 (+0200)
Subject: lib-storage, doveadm: mail_storage_service_user_get_set() - Return mail_user_settings... 
X-Git-Tag: 2.4.0~2297
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c50eba076424e8de00851ebdb7208e1b165359e;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage, doveadm: mail_storage_service_user_get_set() - Return mail_user_settings always
---

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 3796b4c033..a8fafbda23 100644
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -1026,8 +1026,7 @@ static int cmd_dsync_prerun(struct doveadm_mail_cmd_context *_ctx,
 	const struct mail_user_settings *user_set;
 	const char *username = "";
 
-	user_set = mail_storage_service_user_get_set(service_user,
-			&mail_user_setting_parser_info);
+	user_set = mail_storage_service_user_get_set(service_user);
 
 	ctx->fd_in = -1;
 	ctx->fd_out = -1;
diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index bba73d0b3e..3a24126a46 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1714,10 +1714,10 @@ void mail_storage_service_deinit(struct mail_storage_service_ctx **_ctx)
 	dict_drivers_unregister_builtin();
 }
 
-void *mail_storage_service_user_get_set(struct mail_storage_service_user *user,
-					const struct setting_parser_info *root)
+const struct mail_user_settings *
+mail_storage_service_user_get_set(struct mail_storage_service_user *user)
 {
-	return settings_parser_get_root_set(user->set_parser, root);
+	return user->user_set;
 }
 
 const struct mail_storage_service_input *
diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index b08b462d7c..adddc4081f 100644
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -150,10 +150,10 @@ void mail_storage_service_io_activate_user(struct mail_storage_service_user *use
    log prefix. */
 void mail_storage_service_io_deactivate_user(struct mail_storage_service_user *user);
 
-/* Return settings struct for the given root. The settings contain all the
-   changes done by userdb lookups. */
-void *mail_storage_service_user_get_set(struct mail_storage_service_user *user,
-					const struct setting_parser_info *root);
+/* Return the user settings. They contain all the changes done by userdb
+   lookups. */
+const struct mail_user_settings *
+mail_storage_service_user_get_set(struct mail_storage_service_user *user);
 const struct mail_storage_service_input *
 mail_storage_service_user_get_input(struct mail_storage_service_user *user);
 struct setting_parser_context *