]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
virtual plugin: Don't fail if mailbox patterns don't match anything.
authorTimo Sirainen <tss@iki.fi>
Tue, 11 Dec 2012 18:04:10 +0000 (20:04 +0200)
committerTimo Sirainen <tss@iki.fi>
Tue, 11 Dec 2012 18:04:10 +0000 (20:04 +0200)
src/plugins/virtual/virtual-config.c

index cceccc895117e11e1f429526a82d9b926b964ea7..f21bb7d405456bcbc32bb07b220b842f163796e4 100644 (file)
@@ -27,6 +27,7 @@ struct virtual_parse_context {
 
        char sep;
        bool have_wildcards;
+       bool have_mailbox_defines;
 };
 
 static struct mail_search_args *
@@ -169,6 +170,7 @@ virtual_config_parse_line(struct virtual_parse_context *ctx, const char *line,
                bbox->name++;
                ctx->mbox->save_bbox = bbox;
        }
+       ctx->have_mailbox_defines = TRUE;
        array_append(&ctx->mbox->backend_boxes, &bbox, 1);
        return 0;
 }
@@ -419,7 +421,7 @@ int virtual_config_read(struct virtual_mailbox *mbox)
        if (ret == 0 && ctx.have_wildcards)
                ret = virtual_config_expand_wildcards(&ctx);
 
-       if (ret == 0 && array_count(&mbox->backend_boxes) == 0) {
+       if (ret == 0 && !ctx.have_mailbox_defines) {
                mail_storage_set_critical(storage,
                                          "%s: No mailboxes defined", path);
                ret = -1;