doveadm acl debug: Improved output

diff --git a/src/plugins/acl/doveadm-acl.c b/src/plugins/acl/doveadm-acl.c
index d5a46eb04a8c0eed5ea411569d7746415acc7d16..5bfe66714f0d0c91dd87d125d3b5b06d4311bab8 100644 (file)
--- a/src/plugins/acl/doveadm-acl.c
+++ b/src/plugins/acl/doveadm-acl.c
@@ -372,8 +372,8 @@ cmd_acl_debug_mailbox_open(struct doveadm_mail_cmd_context *ctx,
                                        &path) <= 0)
                        i_error("Can't open mailbox %s: %s", mailbox, errstr);
                else {
-                       i_error("Mailbox '%s' doesn't exist in %s",
-                               mailbox, path);
+                       i_error("Mailbox '%s' in namespace '%s' doesn't exist in %s",
+                               box->name, ns->prefix, path);
                }
                mailbox_free(&box);
                return -1;
@@ -399,7 +399,7 @@ static bool cmd_acl_debug_mailbox(struct mailbox *box, bool *retry_r)
        struct acl_backend *backend = acl_mailbox_list_get_backend(box->list);
        struct acl_mailbox_list_context *iter;
        struct acl_lookup_dict_iter *diter;
-       const char *const *rights, *name;
+       const char *const *rights, *name, *path;
        enum mail_flags private_flags_mask;
        string_t *str;
        int ret;
@@ -407,6 +407,11 @@ static bool cmd_acl_debug_mailbox(struct mailbox *box, bool *retry_r)
 
        *retry_r = FALSE;
 
+       i_info("Mailbox '%s' is in namespace '%s'",
+              box->name, box->list->ns->prefix);
+       if (mailbox_get_path_to(box, MAILBOX_LIST_PATH_TYPE_MAILBOX, &path) > 0)
+               i_info("Mailbox path: %s", path);
+
        private_flags_mask = mailbox_get_private_flags_mask(box);
        if (private_flags_mask == 0)
                i_info("All message flags are shared across users in mailbox");