global: Use namespace name in log messages instead of prefix

diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c
index 7031dfc81fe80db988e5e09efaaa6280ec636802..f06ae3ff2175dcbe9ddc187ec8475b177ebd2d0e 100644 (file)
--- a/src/doveadm/doveadm-dsync.c
+++ b/src/doveadm/doveadm-dsync.c
@@ -487,8 +487,8 @@ cmd_dsync_run_local(struct dsync_cmd_context *ctx, struct mail_user *user,
        if (mail_namespace_get_sep(ns) != mail_namespace_get_sep(ns2)) {
                e_error(ctx->ctx.cctx->event,
                        "Mail locations must use the same hierarchy separator "
-                       "(specify namespace prefix=\"%s\" "
-                       "{ separator } explicitly)", ns->prefix);
+                       "(specify namespace %s { separator } explicitly)",
+                       ns->set->name);
                ctx->ctx.exit_code = EX_CONFIG;
                mail_user_deinit(&user2);
                return -1;
@@ -497,11 +497,11 @@ cmd_dsync_run_local(struct dsync_cmd_context *ctx, struct mail_user *user,
            paths_are_equal(ns, ns2, MAILBOX_LIST_PATH_TYPE_INDEX)) {
                e_error(ctx->ctx.cctx->event,
                        "Both source and destination mail_location "
-                       "points to same directory: %s (namespace "
-                       "prefix=\"%s\" { location } is set explicitly?)",
+                       "points to same directory: %s (namespace %s "
+                       "{ location } is set explicitly?)",
                        mailbox_list_get_root_forced(user->namespaces->list,
                                                     MAILBOX_LIST_PATH_TYPE_MAILBOX),
-                       ns->prefix);
+                       ns->set->name);
                ctx->ctx.exit_code = EX_CONFIG;
                mail_user_deinit(&user2);
                return -1;

diff --git a/src/doveadm/doveadm-mail-altmove.c b/src/doveadm/doveadm-mail-altmove.c
index 3177aab6cbc8cb0d938a950d0af4fdb291012c4a..5205ce15919766c06e550d74f6964f9b3aa854f0 100644 (file)
--- a/src/doveadm/doveadm-mail-altmove.c
+++ b/src/doveadm/doveadm-mail-altmove.c
@@ -43,7 +43,7 @@ ns_purge(struct doveadm_mail_cmd_context *ctx, struct mail_namespace *ns,
 {
        if (mail_storage_purge(storage) < 0) {
                e_error(mailbox_list_get_event(ns->list),
-                       "Purging namespace '%s' failed: %s", ns->prefix,
+                       "Purging namespace %s failed: %s", ns->set->name,
                        mail_storage_get_last_internal_error(storage, NULL));
                doveadm_mail_failed_storage(ctx, storage);
                return -1;

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 184b299dd57f448e09bd30e53a2723e6862cc3b4..f3b2f8948a5465d34e5613b0b00fd2daa988eba0 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -151,7 +151,7 @@ cmd_purge_run(struct doveadm_mail_cmd_context *ctx, struct mail_user *user)
                storage = mail_namespace_get_default_storage(ns);
                if (mail_storage_purge(storage) < 0) {
                        e_error(ctx->cctx->event,
-                               "Purging namespace '%s' failed: %s", ns->prefix,
+                               "Purging namespace %s failed: %s", ns->set->name,
                                mail_storage_get_last_internal_error(storage, NULL));
                        doveadm_mail_failed_storage(ctx, storage);
                        ret = -1;

diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree.c b/src/doveadm/dsync/dsync-brain-mailbox-tree.c
index ab06d290c675e482c2b09b433378722dcdd6dfc4..5efa3de8c53af1b07a0bb85a208cfcb98262ea54 100644 (file)
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree.c
@@ -30,14 +30,14 @@ static void dsync_brain_check_namespaces(struct dsync_brain *brain)
                        first_ns = ns;
                } else if (brain->hierarchy_sep != sep) {
                        i_fatal("Synced namespaces have conflicting separators "
-                               "('%c' for prefix=\"%s\", '%c' for prefix=\"%s\")",
-                               brain->hierarchy_sep, first_ns->prefix,
-                               sep, ns->prefix);
+                               "('%c' for %s, '%c' for %s)",
+                               brain->hierarchy_sep, first_ns->set->name,
+                               sep, ns->set->name);
                } else if (brain->escape_char != escape_char) {
                        i_fatal("Synced namespaces have conflicting escape chars "
-                               "('%c' for prefix=\"%s\", '%c' for prefix=\"%s\")",
-                               brain->escape_char, first_ns->prefix,
-                               escape_char, ns->prefix);
+                               "('%c' for %s, '%c' for %s)",
+                               brain->escape_char, first_ns->set->name,
+                               escape_char, ns->set->name);
                }
        }
        if (brain->hierarchy_sep != '\0')
@@ -67,7 +67,7 @@ void dsync_brain_mailbox_trees_init(struct dsync_brain *brain)
                if (!dsync_brain_want_namespace(brain, ns))
                        continue;
                e_debug(brain->event, "Namespace %s has location %s",
-                       ns->prefix, ns->set->location);
+                       ns->set->name, ns->set->location);
                if (dsync_mailbox_tree_fill(brain->local_mailbox_tree, ns,
                                            brain->sync_box,
                                            brain->sync_box_guid,

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index 08fc02dbdd92bf66cb1734f1251b9f349243ca01..37b033b4201ee7a2ce0a75fedadb8b1fd567466e 100644 (file)
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -345,7 +345,7 @@ static void dsync_brain_purge(struct dsync_brain *brain)
                storage = mail_namespace_get_default_storage(ns);
                if (mail_storage_purge(storage) < 0) {
                        e_error(brain->event,
-                               "Purging namespace '%s' failed: %s", ns->prefix,
+                               "Purging namespace %s failed: %s", ns->set->name,
                                mail_storage_get_last_internal_error(storage, NULL));
                }
        }

diff --git a/src/doveadm/dsync/dsync-mailbox-tree-fill.c b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
index 76abd8c208d0c0380bd37e67c22b2b48af61b625..8ef09913a62c8ef8de088c6492990acf3f767971 100644 (file)
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
@@ -62,8 +62,8 @@ dsync_mailbox_tree_add_node(struct dsync_mailbox_tree *tree,
                node->ns = info->ns;
        } else {
                e_error(event,
-                       "Mailbox '%s' exists in two namespaces: '%s' and '%s'",
-                       vname, node->ns->prefix, info->ns->prefix);
+                       "Mailbox '%s' exists in two namespaces: %s and %s",
+                       vname, node->ns->set->name, info->ns->set->name);
                return -1;
        }
        *node_r = node;
@@ -285,8 +285,8 @@ dsync_mailbox_tree_add_change_timestamps(struct dsync_mailbox_tree *tree,
                }
        }
        if (mailbox_log_iter_deinit(&iter) < 0) {
-               e_error(event, "Mailbox log iteration for namespace '%s' failed",
-                       ns->prefix);
+               e_error(event, "Mailbox log iteration for namespace %s failed",
+                       ns->set->name);
                return -1;
        }
        return 0;
@@ -431,8 +431,8 @@ int dsync_mailbox_tree_fill(struct dsync_mailbox_tree *tree,
                }
        } T_END;
        if (mailbox_list_iter_deinit(&iter) < 0) {
-               e_error(event, "Mailbox listing for namespace '%s' failed: %s",
-                       ns->prefix, mailbox_list_get_last_internal_error(ns->list, error_r));
+               e_error(event, "Mailbox listing for namespace %s failed: %s",
+                       ns->set->name, mailbox_list_get_last_internal_error(ns->list, error_r));
                ret = -1;
        }
 
@@ -447,8 +447,8 @@ int dsync_mailbox_tree_fill(struct dsync_mailbox_tree *tree,
                }
        }
        if (mailbox_list_iter_deinit(&iter) < 0) {
-               e_error(event, "Mailbox listing for namespace '%s' failed: %s",
-                       ns->prefix, mailbox_list_get_last_internal_error(ns->list, error_r));
+               e_error(event, "Mailbox listing for namespace %s failed: %s",
+                       ns->set->name, mailbox_list_get_last_internal_error(ns->list, error_r));
                ret = -1;
        }
        if (ret < 0)

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index a0ef366ea73a1b4e4e7f0d923f4d8ab2e8796bc9..43e433d418f5cf6f9c6a0c9b31125f029f82038f 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -507,8 +507,8 @@ imapc_list_get_temp_prefix(struct mailbox_list *_list, bool global)
                        mailbox_list_get_global_temp_prefix(fs_list) :
                        mailbox_list_get_temp_prefix(fs_list);
        } else {
-               i_panic("imapc: Can't return a temp prefix for '%s'",
-                       _list->ns->prefix);
+               i_panic("imapc: Can't return a temp prefix for namespace %s",
+                       _list->ns->set->name);
        }
 }
 

diff --git a/src/lib-storage/index/shared/shared-list.c b/src/lib-storage/index/shared/shared-list.c
index ba8eb2c23e08d3432a490537050afdff381c150d..44e5fa32d4500d77435520f092e0555be794d2a4 100644 (file)
--- a/src/lib-storage/index/shared/shared-list.c
+++ b/src/lib-storage/index/shared/shared-list.c
@@ -81,8 +81,8 @@ shared_list_get_path(struct mailbox_list *list, const char *name,
 static const char *
 shared_list_get_temp_prefix(struct mailbox_list *list, bool global ATTR_UNUSED)
 {
-       i_panic("shared mailbox list: Can't return a temp prefix for '%s'",
-               list->ns->prefix);
+       i_panic("shared mailbox list: Can't return a temp prefix for namespace %s",
+               list->ns->set->name);
 }
 
 static const char *

diff --git a/src/lib-storage/index/shared/shared-storage.c b/src/lib-storage/index/shared/shared-storage.c
index 98b66a7ff3379390eeba994edf53e1c67fde3072..9fdd12500f3e87dcf50e4d52089a27693d81dc0b 100644 (file)
--- a/src/lib-storage/index/shared/shared-storage.c
+++ b/src/lib-storage/index/shared/shared-storage.c
@@ -279,8 +279,8 @@ int shared_storage_get_namespace(struct mail_namespace **_ns,
                                             &owner, &error) < 0) {
                if (owner == NULL || !owner->nonexistent) {
                        mailbox_list_set_critical(list,
-                               "Couldn't create namespace '%s' for user %s: %s",
-                               ns->prefix, userdomain, error);
+                               "Couldn't create namespace %s for user %s: %s",
+                               ns->set->name, userdomain, error);
                        if (owner != NULL)
                                mail_user_deinit(&owner);
                        io_loop_context_switch(old_ioloop_ctx);
@@ -320,9 +320,9 @@ shared_mail_user_init(struct mail_storage *_storage,
        } else {
                /* we'll need to look up the user's home directory */
                if ((ret = mail_user_get_home(owner, &tab[3].value)) < 0) {
-                       mailbox_list_set_critical(ns->list, "Namespace '%s': "
+                       mailbox_list_set_critical(ns->list, "Namespace %s: "
                                "Could not lookup home for user %s",
-                               ns->prefix, owner->username);
+                               ns->set->name, owner->username);
                        mail_user_deinit(&owner);
                        return -1;
                }
@@ -382,8 +382,8 @@ shared_mail_user_init(struct mail_storage *_storage,
 
        if (mail_storage_create(new_ns, NULL, _storage->flags |
                                MAIL_STORAGE_FLAG_NO_AUTOVERIFY, &error) < 0) {
-               mailbox_list_set_critical(ns->list, "Namespace '%s': %s",
-                                         new_ns->prefix, error);
+               mailbox_list_set_critical(ns->list, "Namespace %s: %s",
+                                         new_ns->set->name, error);
                /* owner gets freed by namespace deinit */
                mail_namespace_destroy(new_ns);
                return -1;

diff --git a/src/lib-storage/list/mail-storage-list-index-rebuild.c b/src/lib-storage/list/mail-storage-list-index-rebuild.c
index 6ad82804e1983eb11a775c65d8b85d592bd48d5f..928c04d5371d8fdd85b1001edb5de22f2cc0aa97 100644 (file)
--- a/src/lib-storage/list/mail-storage-list-index-rebuild.c
+++ b/src/lib-storage/list/mail-storage-list-index-rebuild.c
@@ -522,8 +522,8 @@ static int mail_storage_list_index_rebuild_ctx(struct mail_storage_list_index_re
 
        array_foreach_modifiable(&ctx->rebuild_namespaces, rebuild_ns) {
                e_debug(ctx->storage->event,
-                       "Rebuilding list index for namespace '%s'",
-                       rebuild_ns->ns->prefix);
+                       "Rebuilding list index for namespace %s",
+                       rebuild_ns->ns->set->name);
                if (mail_storage_list_index_fill_storage_mailboxes(ctx, rebuild_ns->ns->list) < 0)
                        return -1;
                if (mail_storage_list_index_find_indexed_mailboxes(ctx, rebuild_ns) < 0)

diff --git a/src/lib-storage/mail-namespace.c b/src/lib-storage/mail-namespace.c
index aa9d5b79ae9a5962980cd5e6dd866446c6c5a43a..b91c17f2eaabd16ce918eef8b802551269b57118 100644 (file)
--- a/src/lib-storage/mail-namespace.c
+++ b/src/lib-storage/mail-namespace.c
@@ -174,8 +174,8 @@ int mail_namespaces_init_add(struct mail_user *user,
        }
 
        if (mail_storage_create(ns, driver, 0, &error) < 0) {
-               *error_r = t_strdup_printf("Namespace '%s': %s",
-                                          ns->prefix, error);
+               *error_r = t_strdup_printf("Namespace %s: %s",
+                                          ns->set->name, error);
                mail_namespace_free(ns);
                return -1;
        }
@@ -191,7 +191,7 @@ static bool namespace_is_valid_alias_storage(struct mail_namespace *ns,
                *error_r = t_strdup_printf(
                        "Namespace %s can't have alias_for=%s "
                        "to a different storage type (%s vs %s)",
-                       ns->prefix, ns->alias_for->prefix,
+                       ns->set->name, ns->alias_for->prefix,
                        ns->storage->name, ns->alias_for->storage->name);
                return FALSE;
        }
@@ -201,7 +201,7 @@ static bool namespace_is_valid_alias_storage(struct mail_namespace *ns,
                *error_r = t_strdup_printf(
                        "Namespace %s can't have alias_for=%s "
                        "to a different storage (different root dirs)",
-                       ns->prefix, ns->alias_for->prefix);
+                       ns->set->name, ns->alias_for->prefix);
                return FALSE;
        }
        return TRUE;
@@ -280,9 +280,9 @@ namespace_has_duplicate_listindex(struct mail_namespace *ns,
                if (strcmp(ns_list_index_path, ns2_list_index_path) == 0 &&
                    strcmp(ns_mailboxes_root, ns2_mailboxes_root) != 0) {
                        *error_r = t_strdup_printf(
-                               "Namespaces '%s' and '%s' have different mailboxes paths, but duplicate LISTINDEX path. "
+                               "Namespaces %s and %s have different mailboxes paths, but duplicate LISTINDEX path. "
                                "Add a unique LISTINDEX=<fname>",
-                               ns->prefix, ns2->prefix);
+                               ns->set->name, ns2->set->name);
                        return TRUE;
                }
        }

diff --git a/src/lib-storage/mail-storage-settings.c b/src/lib-storage/mail-storage-settings.c
index a11fd88658d4ed98abe64f8992b86d5118464b92..dd088862c33e6fd8f3d17b527f517d394ca9f3ea 100644 (file)
--- a/src/lib-storage/mail-storage-settings.c
+++ b/src/lib-storage/mail-storage-settings.c
@@ -441,19 +441,17 @@ mail_storage_settings_check_namespaces(struct event *event,
                }
                if (alias_ns == NULL) {
                        *error_r = t_strdup_printf(
-                               "Namespace '%s': alias_for points to "
+                               "Namespace %s: alias_for points to "
                                "unknown namespace name: %s",
-                               ns->prefix != NULL ? ns->prefix : "",
-                               ns->alias_for);
+                               ns->name, ns->alias_for);
                        settings_free(ns);
                        return FALSE;
                }
                if (alias_ns->alias_for[0] != '\0') {
                        *error_r = t_strdup_printf(
-                               "Namespace '%s': alias_for chaining isn't "
+                               "Namespace %s: alias_for chaining isn't "
                                "allowed: %s -> %s",
-                               ns->prefix != NULL ? ns->prefix : "",
-                               ns->alias_for, alias_ns->alias_for);
+                               ns->name, ns->alias_for, alias_ns->alias_for);
                        settings_free(alias_ns);
                        settings_free(ns);
                        return FALSE;
@@ -661,11 +659,8 @@ static bool namespace_settings_ext_check(struct event *event,
                                         const char **error_r)
 {
        struct mail_namespace_settings *ns = _set;
-       const char *name;
        int ret;
 
-       name = ns->prefix != NULL ? ns->prefix : "";
-
 #ifndef CONFIG_BINARY
        i_assert(ns->location[0] == SETTING_STRVAR_UNEXPANDED[0] ||
                 ns->location[0] == SETTING_STRVAR_EXPANDED[0]);
@@ -673,14 +668,14 @@ static bool namespace_settings_ext_check(struct event *event,
 #endif
 
        if (ns->separator[0] != '\0' && ns->separator[1] != '\0') {
-               *error_r = t_strdup_printf("Namespace '%s': "
+               *error_r = t_strdup_printf("Namespace %s: "
                        "Hierarchy separator must be only one character long",
-                       name);
+                       ns->name);
                return FALSE;
        }
-       if (!uni_utf8_str_is_valid(name)) {
-               *error_r = t_strdup_printf("Namespace prefix not valid UTF8: %s",
-                                          name);
+       if (!uni_utf8_str_is_valid(ns->prefix)) {
+               *error_r = t_strdup_printf("Namespace %s: prefix not valid UTF8: %s",
+                                          ns->name, ns->prefix);
                return FALSE;
        }
 

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 8b4302c543c85e56141bf054e9a4a7603eba7aac..90f392ad225baccde6e8f7ff9ccaf91decd5c26e 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -297,7 +297,7 @@ mail_storage_create_root(struct mailbox_list *list,
                if (mail_storage_verify_root(root_dir, type_name, &error) < 0) {
                        e_debug(list->event,
                                "Namespace %s: Creating storage despite: %s",
-                               list->ns->prefix, error);
+                               list->ns->set->name, error);
                }
                return 0;
        }
@@ -963,8 +963,8 @@ struct mailbox *mailbox_alloc(struct mailbox_list *list, const char *vname,
                         !str_begins_with(list->ns->prefix, "INBOX")) {
                        mailbox_list_set_critical(list,
                                "Invalid server configuration: "
-                               "Namespace prefix=%s must be uppercase INBOX",
-                               list->ns->prefix);
+                               "Namespace %s: prefix=%s must be uppercase INBOX",
+                               list->ns->set->name, list->ns->prefix);
                        open_error = MAIL_ERROR_TEMP;
                } else {
                        vname = t_strconcat("INBOX", suffix, NULL);
@@ -1108,9 +1108,8 @@ namespace_find_special_use(struct mail_namespace *ns, const char *special_use,
 
                error = mailbox_list_get_last_error(ns->list, error_code_r);
                e_error(ns->list->event,
-                       "Failed to find mailbox with SPECIAL-USE flag '%s' "
-                       "in namespace '%s': %s",
-                       special_use, ns->prefix, error);
+                       "Namespace %s: Failed to find mailbox with SPECIAL-USE flag '%s': %s",
+                       ns->set->name, special_use, error);
                return -1;
        }
        return ret;
@@ -2086,22 +2085,22 @@ mailbox_lists_rename_compatible(struct mailbox_list *list1,
 {
        if (!nullequals(list1->set.alt_dir, list2->set.alt_dir)) {
                *error_r = t_strdup_printf("Namespace %s has alt dir, %s doesn't",
-                                          list1->ns->prefix, list2->ns->prefix);
+                       list1->ns->set->name, list2->ns->set->name);
                return FALSE;
        }
        if (!nullequals(list1->set.index_dir, list2->set.index_dir)) {
                *error_r = t_strdup_printf("Namespace %s has index dir, %s doesn't",
-                                          list1->ns->prefix, list2->ns->prefix);
+                       list1->ns->set->name, list2->ns->set->name);
                return FALSE;
        }
        if (!nullequals(list1->set.index_cache_dir, list2->set.index_cache_dir)) {
                *error_r = t_strdup_printf("Namespace %s has index cache dir, %s doesn't",
-                                          list1->ns->prefix, list2->ns->prefix);
+                       list1->ns->set->name, list2->ns->set->name);
                return FALSE;
        }
        if (!nullequals(list1->set.control_dir, list2->set.control_dir)) {
                *error_r = t_strdup_printf("Namespace %s has control dir, %s doesn't",
-                                          list1->ns->prefix, list2->ns->prefix);
+                       list1->ns->set->name, list2->ns->set->name);
                return FALSE;
        }
        return TRUE;

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 21d0edafaa231490f2ca126d8010710a3ecfb209..d4e93ec425134bc28eda41b3776c102303194325 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -893,7 +893,7 @@ mailbox_list_get_storage_driver(struct mailbox_list *list, const char *driver,
                                     storage_r, &error) < 0) {
                mailbox_list_set_critical(list,
                        "Namespace %s: Failed to create storage '%s': %s",
-                       list->ns->prefix, driver, error);
+                       list->ns->set->name, driver, error);
                return -1;
        }
        return 0;
@@ -967,7 +967,7 @@ mailbox_list_get_permissions_stat(struct mailbox_list *list, const char *path,
                        e_debug(list->event,
                                "Namespace %s: %s doesn't exist yet, "
                                "using default permissions",
-                               list->ns->prefix, path);
+                               list->ns->set->name, path);
                }
                return FALSE;
        }
@@ -1085,7 +1085,7 @@ mailbox_list_get_permissions_internal(struct mailbox_list *list,
        if (name == NULL) {
                e_debug(list->event,
                        "Namespace %s: Using permissions from %s: "
-                       "mode=0%o gid=%s", list->ns->prefix,
+                       "mode=0%o gid=%s", list->ns->set->name,
                        path != NULL ? path : "",
                        (int)permissions_r->dir_create_mode,
                        permissions_r->file_create_gid == (gid_t)-1 ? "default" :

diff --git a/src/plugins/acl/doveadm-acl.c b/src/plugins/acl/doveadm-acl.c
index 035890f5771f90ecff8051471a1153125f84e447..91bb70b982b1696721a5c6d47a93e180b8c3ea52 100644 (file)
--- a/src/plugins/acl/doveadm-acl.c
+++ b/src/plugins/acl/doveadm-acl.c
@@ -379,8 +379,8 @@ cmd_acl_debug_mailbox_open(struct doveadm_mail_cmd_context *ctx,
                                "Can't open mailbox %s: %s", mailbox, errstr);
                else {
                        e_error(box->event,
-                               "Mailbox '%s' in namespace '%s' doesn't exist in %s",
-                               box->name, ns->prefix, path);
+                               "Mailbox '%s' in namespace %s doesn't exist in %s",
+                               box->name, ns->set->name, path);
                }
                mailbox_free(&box);
                return -1;
@@ -415,8 +415,8 @@ static bool cmd_acl_debug_mailbox(struct mailbox *box, bool *retry_r)
 
        *retry_r = FALSE;
 
-       e_info(box->event, "Mailbox '%s' is in namespace '%s'",
-              box->name, box->list->ns->prefix);
+       e_info(box->event, "Mailbox '%s' is in namespace %s",
+              box->name, box->list->ns->set->name);
        if (mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_MAILBOX, &path) > 0)
                e_info(box->event, "Mailbox path: %s", path);
 

diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index fd3c7820e572d0218e63f09d14c6648d25998ded..f64a28f6317a2232f2eda78e87b0c0cb5e43a6ff 100644 (file)
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -928,8 +928,8 @@ fts_mailbox_list_created(struct mailbox_list *list)
 
        if (!mailbox_list_get_root_path(list, MAILBOX_LIST_PATH_TYPE_INDEX, &path)) {
                e_debug(list->event,
-                       "fts: Indexes disabled for namespace '%s'",
-                       list->ns->prefix);
+                       "fts: Indexes disabled for namespace %s",
+                       list->ns->set->name);
                return;
        }
 

diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index 26556797e16a3be80406f44ecdc2435ffee8d643..7aa1fb31f7509ccd750db0a2fa8fc4a804a0ac18 100644 (file)
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -101,8 +101,8 @@ quota_mailbox_iter_deinit(struct quota_mailbox_iter **_iter,
        if (iter->iter != NULL) {
                if (mailbox_list_iter_deinit(&iter->iter) < 0) {
                        error2 = t_strdup_printf(
-                               "Listing namespace '%s' failed: %s",
-                               iter->ns->prefix,
+                               "Listing namespace %s failed: %s",
+                               iter->ns->set->name,
                                mailbox_list_get_last_internal_error(iter->ns->list, NULL));
                        ret = -1;
                }
@@ -144,8 +144,7 @@ quota_mailbox_iter_next(struct quota_mailbox_iter *iter)
        }
        if (mailbox_list_iter_deinit(&iter->iter) < 0) {
                iter->error = t_strdup_printf(
-                       "Listing namespace '%s' failed: %s",
-                       iter->ns->prefix,
+                       "Listing namespace %s failed: %s", iter->ns->set->name,
                        mailbox_list_get_last_internal_error(iter->ns->list, NULL));
        }
        if (iter->ns->prefix_len > 0 &&

diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c
index 9fd89e5e89191f99acb12529a63c31938d2149a2..b58c33d52a55ccacc1401f1d9fc1cb878583a3ff 100644 (file)
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -225,9 +225,9 @@ static bool imapc_quota_client_init(struct imapc_quota_root *root)
                if ((storage->class_flags &
                     MAIL_STORAGE_CLASS_FLAG_NOQUOTA) == 0) {
                        e_warning(root->root.backend.event,
-                                 "Namespace '%s' is not imapc, "
+                                 "Namespace %s is not imapc, "
                                  "skipping for imapc quota",
-                                 root->imapc_ns->prefix);
+                                 root->imapc_ns->set->name);
                }
                return FALSE;
        }

diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index 76ef0867cdbfffd3b6a81a6ae7a482acb40899c9..7fa42c10dcd6a709c4dc4cd67f7637c9c9496b7e 100644 (file)
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -669,9 +669,9 @@ static bool maildirquota_limits_init(struct maildir_quota_root *root)
                if ((storage->class_flags &
                     MAIL_STORAGE_CLASS_FLAG_NOQUOTA) == 0) {
                        e_warning(root->root.backend.event,
-                                 "Namespace '%s' is not Maildir, "
+                                 "Namespace %s is not Maildir, "
                                  "skipping for Maildir++ quota",
-                                 root->maildirsize_ns->prefix);
+                                 root->maildirsize_ns->set->name);
                }
                root->maildirsize_path = NULL;
                return FALSE;