Mercurial > dovecot > core-2.2

changeset 12984:490a81fe688f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Remove invalid subscription file entries instead of only ignoring them.
author Timo Sirainen <tss@iki.fi>
date Tue, 03 May 2011 09:43:41 +0200
parents 663528c5c799
children 036260ae0261
files src/lib-storage/list/mailbox-list-subscriptions.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);