From: Timo Sirainen <tss@iki.fi>
Date: Tue, 3 May 2011 07:43:41 +0000 (+0200)
Subject: lib-storage: Remove invalid subscription file entries instead of only ignoring them.
X-Git-Tag: 2.0.13~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39f78d7dc08c4b9ee3a8697bfe243f5cf0c1423b;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove invalid subscription file entries instead of only ignoring them.
---

diff --git a/src/lib-storage/list/mailbox-list-subscriptions.c b/src/lib-storage/list/mailbox-list-subscriptions.c
index 66e01ad428..453f5f3e38 100644
--- a/src/lib-storage/list/mailbox-list-subscriptions.c
+++ b/src/lib-storage/list/mailbox-list-subscriptions.c
@@ -61,8 +61,12 @@ mailbox_list_subscriptions_fill_real(struct mailbox_list_iterate_context *ctx,
 		if (!mailbox_list_is_valid_existing_name(ns->list, name)) {
 			/* we'll only get into trouble if we show this */
 			i_warning("Subscriptions file %s: "
-				  "Ignoring invalid entry: %s",
+				  "Removing invalid entry: %s",
 				  path, orig_name);
+			(void)subsfile_set_subscribed(ns->list, path,
+				mailbox_list_get_temp_prefix(ns->list),
+				orig_name, FALSE);
+
 		} else {
 			name = mail_namespace_get_vname(ns, vname, name);
 			mailbox_list_iter_update(&update_ctx, name);