dovecot-2.2: virtual plugin: Don't fail if mailbox patterns don'...

dovecot at dovecot.org dovecot at dovecot.org
Sat Jan 5 01:14:35 EET 2013


details:   http://hg.dovecot.org/dovecot-2.2/rev/f13f2725882e
changeset: 15554:f13f2725882e
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Dec 11 20:04:10 2012 +0200
description:
virtual plugin: Don't fail if mailbox patterns don't match anything.

diffstat:

 src/plugins/virtual/virtual-config.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r 265adb00eacd -r f13f2725882e src/plugins/virtual/virtual-config.c
--- a/src/plugins/virtual/virtual-config.c	Sat Dec 08 11:13:51 2012 +0200
+++ b/src/plugins/virtual/virtual-config.c	Tue Dec 11 20:04:10 2012 +0200
@@ -27,6 +27,7 @@
 
 	char sep;
 	bool have_wildcards;
+	bool have_mailbox_defines;
 };
 
 static struct mail_search_args *
@@ -169,6 +170,7 @@
 		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 @@
 	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;


More information about the dovecot-cvs mailing list