lib-storage: Remove mail_namespace.mail_set

It was just a pointer to mail_user.mail_set instead of namespace-specific
settings.

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 6ddafd4f872f6b1e6bf83c20968639da29125757..d77984ca384c4f42a69f3e0f801a38c4293faed9 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -352,7 +352,6 @@ shared_mail_user_init(struct mail_storage *_storage,
        new_ns->flags = (NAMESPACE_FLAG_SUBSCRIPTIONS & ns->flags) |
                NAMESPACE_FLAG_LIST_PREFIX | NAMESPACE_FLAG_HIDDEN |
                NAMESPACE_FLAG_AUTOCREATED | NAMESPACE_FLAG_INBOX_ANY;
-       new_ns->mail_set = _storage->set;
        i_array_init(&new_ns->all_storages, 2);
 
        if (ret <= 0) {

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index 8f19fa7c7bbfb396a01c897109a33c102630572e..678ba52847c8c931f86365df4ccf42fb0746fd8c 100644 (file)
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -81,7 +81,6 @@ int mail_namespace_alloc(struct mail_user *user,
        ns->set = ns_set;
        if (ns_set->pool != NULL)
                pool_ref(ns_set->pool);
-       ns->mail_set = mail_user_set_get_storage_set(user);
        i_array_init(&ns->all_storages, 2);
 
        if (strcmp(ns_set->type, "private") == 0) {
@@ -560,7 +559,6 @@ struct mail_namespace *mail_namespaces_init_empty(struct mail_user *user)
        ns->prefix = i_strdup("");
        ns->flags = NAMESPACE_FLAG_INBOX_USER | NAMESPACE_FLAG_INBOX_ANY |
                NAMESPACE_FLAG_LIST_PREFIX | NAMESPACE_FLAG_SUBSCRIPTIONS;
-       ns->mail_set = mail_user_set_get_storage_set(user);
        i_array_init(&ns->all_storages, 2);
        return ns;
 }

diff --git a/src/lib-storage/mail-namespace.h b/src/lib-storage/mail-namespace.h
index eb032e18be1bd53d368d15d9e334998ce86d9c7d..d07b7e4226e2a60d043d3d6c7d7e5a892b19ac73 100644 (file)
--- a/src/lib-storage/mail-namespace.h
+++ b/src/lib-storage/mail-namespace.h
@@ -71,7 +71,6 @@ struct mail_namespace {
        ARRAY(struct mail_storage *) all_storages;
 
        const struct mail_namespace_settings *set;
-       const struct mail_storage_settings *mail_set;
 
        bool destroyed:1;
 };

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 0c117941da336674735a460df11a361c0be571ce..87b60e0bc6f5fbe49b37f9b85d5d6848e2f49557 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -143,7 +143,7 @@ int mailbox_list_create(const char *driver, struct mail_namespace *ns,
        list->event = event_create(ns->user->event);
        event_add_str(list->event, "namespace", ns->set->name);
        list->ns = ns;
-       list->mail_set = ns->mail_set;
+       list->mail_set = mail_user_set_get_storage_set(ns->user);
        list->flags = flags;
        list->root_permissions.file_create_mode = (mode_t)-1;
        list->root_permissions.dir_create_mode = (mode_t)-1;