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

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 3796b4c033bfc499c740b590c36236ee68eb690d..a8fafbda2320902d5c714647d5b2f66cacae542a 100644 (file)
--- 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 bba73d0b3e90b80807b1e82a69d56abf48ca24a4..3a24126a46db06afde03002fff897839945d1bf5 100644 (file)
--- 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 b08b462d7cf940f4f406afcaf647d7ed00b3eb17..adddc4081f21f6145501c0b0c44016e47282ab75 100644 (file)
--- 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 *