From db16b2606ff053044e67761c89874ce3f07c6af7 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 27 Feb 2022 21:15:44 +0100 Subject: [PATCH] lda, lmtp: raw_storage_create_from_set() - Use the same source for user settings and settings parser --- src/lda/main.c | 6 +++--- src/lmtp/lmtp-client.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lda/main.c b/src/lda/main.c index 7e4d8fffe9..9a1755ade2 100644 --- a/src/lda/main.c +++ b/src/lda/main.c @@ -154,9 +154,9 @@ lda_raw_mail_open(struct mail_deliver_input *dinput, const char *path) time_t mtime; int ret; - user_set = master_service_settings_get_root_set(master_service, - &mail_user_setting_parser_info); - raw_mail_user = raw_storage_create_from_set(dinput->rcpt_user->unexpanded_set_parser, + user_set = settings_parser_get_root_set(dinput->rcpt_user->unexpanded_set_parser, + &mail_user_setting_parser_info); + raw_mail_user = raw_storage_create_from_set(dinput->rcpt_user->set_parser, dinput->rcpt_user->set_info, user_set); diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c index 4b2970e0ed..0030c6f869 100644 --- a/src/lmtp/lmtp-client.c +++ b/src/lmtp/lmtp-client.c @@ -103,8 +103,8 @@ client_raw_user_create(struct client *client, { const struct mail_user_settings *user_set; - user_set = master_service_settings_get_root_set(master_service, - &mail_user_setting_parser_info); + user_set = settings_parser_get_root_set(client->set_parser, + &mail_user_setting_parser_info); client->raw_mail_user = raw_storage_create_from_set(set_parser, client->user_set_info, user_set); -- 2.47.3