]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm mailbox metadata list: Fix listing all metadata.
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 10 Feb 2017 10:46:50 +0000 (12:46 +0200)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 10 Feb 2017 11:34:54 +0000 (13:34 +0200)
It was listing only private attributes, because key_type=0 happens to be
MAIL_ATTRIBUTE_TYPE_PRIVATE and key was never NULL.

src/doveadm/doveadm-mail-mailbox-metadata.c

index 3222049409efb0629e2656b4180b64fcd31a8f8b..5abce9a60fbbf3c0c30fc341b8d64e0f790349b1 100644 (file)
@@ -265,13 +265,13 @@ cmd_mailbox_metadata_list_run(struct doveadm_mail_cmd_context *_ctx,
        if (ret != 0)
                return ret;
 
-       if (ctx->key == NULL || ctx->key_type == MAIL_ATTRIBUTE_TYPE_PRIVATE) {
+       if (ctx->key[0] == '\0' || ctx->key_type == MAIL_ATTRIBUTE_TYPE_PRIVATE) {
                if (cmd_mailbox_metadata_list_run_iter(ctx, box, MAIL_ATTRIBUTE_TYPE_PRIVATE) < 0) {
                        doveadm_mail_failed_mailbox(_ctx, box);
                        ret = -1;
                }
        }
-       if (ctx->key == NULL || ctx->key_type == MAIL_ATTRIBUTE_TYPE_SHARED) {
+       if (ctx->key[0] == '\0' || ctx->key_type == MAIL_ATTRIBUTE_TYPE_SHARED) {
                if (cmd_mailbox_metadata_list_run_iter(ctx, box, MAIL_ATTRIBUTE_TYPE_SHARED) < 0) {
                        doveadm_mail_failed_mailbox(_ctx, box);
                        ret = -1;