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 66e01ad428e58e6a0f3cfec3134a0ae438925ec8..453f5f3e380c3293e090f47a2bc3ee35b99240a0 100644 (file)
--- 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);