dovecot-2.0: lib-storage: Remove invalid subscription file entri...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/490a81fe688f
changeset: 12762:490a81fe688f
user:      Timo Sirainen <tss at iki.fi>
date:      Tue May 03 09:43:41 2011 +0200
description:
lib-storage: Remove invalid subscription file entries instead of only ignoring them.

diffstat:

 src/lib-storage/list/mailbox-list-subscriptions.c |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (17 lines):

diff -r 663528c5c799 -r 490a81fe688f src/lib-storage/list/mailbox-list-subscriptions.c
--- a/src/lib-storage/list/mailbox-list-subscriptions.c	Sat Apr 30 15:55:08 2011 +0300
+++ b/src/lib-storage/list/mailbox-list-subscriptions.c	Tue May 03 09:43:41 2011 +0200
@@ -61,8 +61,12 @@
 		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);