From: Timo Sirainen <tss@iki.fi>
Date: Tue, 11 Dec 2012 18:04:10 +0000 (+0200)
Subject: virtual plugin: Don't fail if mailbox patterns don't match anything.
X-Git-Tag: 2.1.13~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a524e87e44ae629cf90262e92f7972ea3450c35;p=thirdparty%2Fdovecot%2Fcore.git

virtual plugin: Don't fail if mailbox patterns don't match anything.
---

diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c
index cceccc8951..f21bb7d405 100644
--- a/src/plugins/virtual/virtual-config.c
+++ b/src/plugins/virtual/virtual-config.c
@@ -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;