lda, lmtp: raw_storage_create_from_set() - Use the same source for user settings...

diff --git a/src/lda/main.c b/src/lda/main.c
index 7e4d8fffe9702725a1c7a4fbb6ce47054248a4ef..9a1755ade2b3314e17c2008846d86fc77d37d8a6 100644 (file)
--- 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 4b2970e0ed4965bb6f3607f120402718a3828501..0030c6f8690a67871e7cf65fca71611de51db46a 100644 (file)
--- 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);