lib-storage: Remove unused mail_user.set_instance

diff --git a/src/lib-storage/index/raw/raw-storage.h b/src/lib-storage/index/raw/raw-storage.h
index 70fe423c7cbe33734fea0e83326671e29a9effde..36f71df4cd50b7591b371e10d125d98838d8ef3e 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.h
+++ b/src/lib-storage/index/raw/raw-storage.h
@@ -4,6 +4,7 @@
 #include "index-storage.h"
 
 struct setting_parser_context;
+struct master_service_settings_instance;
 struct mail_storage_service_ctx;
 
 #define RAW_STORAGE_NAME "raw"

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index 0e3b556046c5e7c81fa560ed47f11466e1d6a652..019bb610b27300d30cf9463a1cbf8baeb386ce05 100644 (file)
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -83,8 +83,6 @@ mail_user_alloc(struct mail_storage_service_user *service_user)
                mail_storage_service_user_get_event(service_user);
        const char *username =
                mail_storage_service_user_get_username(service_user);
-       struct master_service_settings_instance *service_user_set_instance =
-               mail_storage_service_user_get_settings_instance(service_user);
        i_assert(*username != '\0');
 
        pool_t pool = pool_alloconly_create(MEMPOOL_GROWING"mail user", 16*1024);
@@ -94,7 +92,6 @@ mail_user_alloc(struct mail_storage_service_user *service_user)
        user->service_user = service_user;
        mail_storage_service_user_ref(service_user);
        user->username = p_strdup(pool, username);
-       user->set_instance = service_user_set_instance;
        user->set = mail_storage_service_user_get_set(service_user);
        user->service = master_service_get_name(master_service);
        user->default_normalizer = uni_utf8_to_decomposed_titlecase;

diff --git a/src/lib-storage/mail-user.h b/src/lib-storage/mail-user.h
index cddf8ec8933659be1fc3ca7957578d201fb5c170..634bbf461eba36b035d6485bb81163ef483e3a6f 100644 (file)
--- a/src/lib-storage/mail-user.h
+++ b/src/lib-storage/mail-user.h
@@ -57,8 +57,6 @@ struct mail_user {
           This could be set by plugins that need to fail the initialization. */
        const char *error;
 
-       /* Points to service_user->set_instance */
-       struct master_service_settings_instance *set_instance;
        const struct mail_user_settings *set;
        struct mail_storage_settings *_mail_set;
        struct ssl_iostream_settings *ssl_set;