lib-storage: index_list_mailbox_open() - Check that mailbox has not been deleted

Without this, removing a mailbox (obox) used in a virtual box
fails to understand that the box has been removed intentionally
and tries to recreate/rebuild it.

diff --git a/src/lib-storage/list/mailbox-list-index-backend.c b/src/lib-storage/list/mailbox-list-index-backend.c
index 88dd6c74e28ab791341c344cdd977c70bf40fddc..70f79ccef367a4a8ea674b4d15849b81a2d3f288 100644 (file)
--- a/src/lib-storage/list/mailbox-list-index-backend.c
+++ b/src/lib-storage/list/mailbox-list-index-backend.c
@@ -539,6 +539,16 @@ static int index_list_mailbox_open(struct mailbox *box)
        const unsigned char *name_hdr;
        size_t name_hdr_size;
 
+       if (!box->creating && (box->flags & MAILBOX_FLAG_OPEN_DELETED) == 0) {
+               if (mailbox_list_index_refresh(box->list) < 0)
+                       return -1;
+               if (mailbox_list_index_lookup(box->list, box->name) == NULL) {
+                       mail_storage_set_error(box->storage, MAIL_ERROR_NOTFOUND,
+                                              T_MAIL_ERR_MAILBOX_NOT_FOUND(box->name));
+                       return -1;
+               }
+       }
+
        if (ibox->module_ctx.super.open(box) < 0)
                return -1;