lib-storage: Move namespace setting to mail_user_settings

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index 848d926ec3b0244ad2426ed72f94333c6f0f7dac..6a8f1c0335878f5c7797f77e37b94dafa04f8f01 100644 (file)
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -450,10 +450,8 @@ int mail_namespaces_init(struct mail_user *user, const char **error_r)
 
         namespaces = NULL; ns_p = &namespaces;
 
-       const struct mail_storage_settings *mail_set =
-               mail_user_set_get_storage_set(user);
-       if (array_is_created(&mail_set->namespaces))
-               ns_names = array_get(&mail_set->namespaces, &count);
+       if (array_is_created(&user->set->namespaces))
+               ns_names = array_get(&user->set->namespaces, &count);
        else {
                ns_names = NULL;
                count = 0;

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index e351f0bb0d3feb89744acfd2baa3ff28cfa6de10..faf6ad70a197c242fecd306421ff2bd1fd3990a3 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -109,10 +109,6 @@ static const struct setting_define mail_storage_setting_defines[] = {
 
        DEF(STR, recipient_delimiter),
 
-       { .type = SET_FILTER_ARRAY, .key = "namespace",
-          .offset = offsetof(struct mail_storage_settings, namespaces),
-          .filter_array_field_name = "namespace_name" },
-
        SETTING_DEFINE_LIST_END
 };
 
@@ -186,8 +182,6 @@ const struct mail_storage_settings mail_storage_default_settings = {
        .pop3_uidl_format = "%{uid | hex(8)}%{uidvalidity | hex(8)}",
 
        .recipient_delimiter = "+",
-
-       .namespaces = ARRAY_INIT,
 };
 
 static const struct setting_keyvalue mail_storage_default_settings_keyvalue[] = {
@@ -393,6 +387,9 @@ static const struct setting_define mail_user_setting_defines[] = {
 
        DEF(STR, mail_log_prefix),
 
+       { .type = SET_FILTER_ARRAY, .key = "namespace",
+          .offset = offsetof(struct mail_user_settings, namespaces),
+          .filter_array_field_name = "namespace_name" },
        DEF(STR, hostname),
        DEF(STR, postmaster_address),
 
@@ -432,6 +429,7 @@ static const struct mail_user_settings mail_user_default_settings = {
 
        .mail_log_prefix = "%{service}(%{user})<%{process:pid}><%{session}>: ",
 
+       .namespaces = ARRAY_INIT,
        .hostname = "",
        .postmaster_address = "postmaster@%{user|domain|default(hostname)}",
 };

diff --git a/src/lib-storage/mail-storage-settings.h b/src/lib-storage/mail-storage-settings.h
index 220a661208e23e59ac2cef97f362943a66012a92..4d0f55f1fe549e21409949757868625a39d2a3c5 100644 (file)
--- a/src/lib-storage/mail-storage-settings.h
+++ b/src/lib-storage/mail-storage-settings.h
@@ -101,8 +101,6 @@ struct mail_storage_settings {
 
        ARRAY_TYPE(const_string) mail_attachment_detection_options;
 
-       ARRAY_TYPE(const_string) namespaces;
-
        enum file_lock_method parsed_lock_method;
        enum fsync_mode parsed_fsync_mode;
 
@@ -184,6 +182,7 @@ struct mail_user_settings {
 
        const char *mail_log_prefix;
 
+       ARRAY_TYPE(const_string) namespaces;
        const char *hostname;
        const char *postmaster_address;