lib-storage: Re-open mailbox after it's undeleted.

This is needed with mailbox formats that didn't fully open the mailbox while
it was undeleted.

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 90bc26d52738f0ad4326ef05b26b3be817692428..c61abbe2b9e7453e12fb5ec927a199bf0cb70c23 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -1179,6 +1179,11 @@ int mailbox_open(struct mailbox *box)
                   undelete it and reopen. */
                if(!mailbox_try_undelete(box))
                        return -1;
+
+               /* make sure we close the mailbox in the middle. some backends
+                  may not have fully opened the mailbox while it was being
+                  undeleted. */
+               mailbox_close(box);
                if (mailbox_open_full(box, NULL) < 0)
                        return -1;
        }