lmtp: Remove client.user_set

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index e0f8fc5c4726f53873be85bc94835c1cc79bd117..103e4cf4ffeeabc802c009fd220cf54d6e03cacd 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -111,7 +111,6 @@ static void client_read_settings(struct client *client, bool ssl)
 {
        struct mail_storage_service_input input;
        const struct setting_parser_context *set_parser;
-       struct mail_user_settings *user_set;
        struct lmtp_settings *lmtp_set;
        struct lda_settings *lda_set;
        const char *error;
@@ -131,15 +130,13 @@ static void client_read_settings(struct client *client, bool ssl)
                                               &set_parser, &error) < 0)
                i_fatal("%s", error);
 
-       lmtp_settings_dup(set_parser, client->pool,
-                         &user_set, &lmtp_set, &lda_set);
+       lmtp_settings_dup(set_parser, client->pool, &lmtp_set, &lda_set);
        const struct var_expand_table *tab =
                mail_storage_service_get_var_expand_table(storage_service, &input);
        if (settings_var_expand(&lmtp_setting_parser_info, lmtp_set,
                                client->pool, tab, &error) <= 0)
                i_fatal("Failed to expand settings: %s", error);
        client->service_set = master_service_settings_get(master_service);
-       client->user_set = user_set;
        client->lmtp_set = lmtp_set;
        client->unexpanded_lda_set = lda_set;
 }

diff --git a/src/lmtp/lmtp-client.h b/src/lmtp/lmtp-client.h
index 43e592c7a7475014c1bddea204c50cbc43dd00d9..26c249383432f8ace64ca867e46cb85adcd2fd6a 100644 (file)
--- a/src/lmtp/lmtp-client.h
+++ b/src/lmtp/lmtp-client.h
@@ -74,7 +74,6 @@ struct client {
        struct event *event;
 
        const struct setting_parser_info *user_set_info;
-       const struct mail_user_settings *user_set;
        const struct lda_settings *unexpanded_lda_set;
        const struct lmtp_settings *lmtp_set;
        const struct master_service_settings *service_set;

diff --git a/src/lmtp/lmtp-settings.c b/src/lmtp/lmtp-settings.c
index bc8a69fd2b643331257159698337a43e8363987e..7405b1f18b543e0407a2a298066b1a3bbe1d2ff9 100644 (file)
--- a/src/lmtp/lmtp-settings.c
+++ b/src/lmtp/lmtp-settings.c
@@ -188,16 +188,11 @@ static bool lmtp_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 
 void lmtp_settings_dup(const struct setting_parser_context *set_parser,
                       pool_t pool,
-                      struct mail_user_settings **user_set_r,
                       struct lmtp_settings **lmtp_set_r,
                       struct lda_settings **lda_set_r)
 {
        const char *error;
 
-       *user_set_r = settings_parser_get_root_set(set_parser,
-                               &mail_user_setting_parser_info);
-       *user_set_r = settings_dup(&mail_user_setting_parser_info,
-                                  *user_set_r, pool);
        *lda_set_r = settings_parser_get_root_set(set_parser,
                                &lda_setting_parser_info);
        *lda_set_r = settings_dup(&lda_setting_parser_info,

diff --git a/src/lmtp/lmtp-settings.h b/src/lmtp/lmtp-settings.h
index 3b2eaa33803611551f3e57932a1d1b0f49d9a622..37cfba499ea0dd6b1001c3f73925d0f155970bda 100644 (file)
--- a/src/lmtp/lmtp-settings.h
+++ b/src/lmtp/lmtp-settings.h
@@ -46,7 +46,6 @@ extern const struct setting_parser_info lmtp_setting_parser_info;
 
 void lmtp_settings_dup(const struct setting_parser_context *set_parser,
                       pool_t pool,
-                      struct mail_user_settings **user_set_r,
                       struct lmtp_settings **lmtp_set_r,
                       struct lda_settings **lda_set_r);