From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 27 Oct 2023 10:11:21 +0000 (+0300)
Subject: lib-storage: Remove mail_namespace.mail_set
X-Git-Tag: 2.4.1~1316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a45afb25dd777823a3aa0b41cf54dbcb244c679a;p=thirdparty%2Fdovecot%2Fcore.git

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 6ddafd4f87..d77984ca38 100644
--- 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 8f19fa7c7b..678ba52847 100644
--- 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 eb032e18be..d07b7e4226 100644
--- 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 0c117941da..87b60e0bc6 100644
--- 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;