From: Timo Sirainen <tss@iki.fi>
Date: Fri, 19 Mar 2010 13:34:39 +0000 (+0200)
Subject: mdbox: Storage rebuild panics now earlier if its namespace unexpectedly isn't found.
X-Git-Tag: 2.0.beta4~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b87242267955a24870f07ddd8d66295ca806056;p=thirdparty%2Fdovecot%2Fcore.git

mdbox: Storage rebuild panics now earlier if its namespace unexpectedly isn't found.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
index 75c7b7d8f4..8b76b19491 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-storage-rebuild.c
@@ -522,16 +522,17 @@ rebuild_namespace_mailboxes(struct mdbox_storage_rebuild_context *ctx,
 
 static int rebuild_mailboxes(struct mdbox_storage_rebuild_context *ctx)
 {
-	struct mail_user *user = ctx->storage->storage.storage.user;
+	struct mail_storage *storage = &ctx->storage->storage.storage;
 	struct mail_namespace *ns;
 
-	for (ns = user->namespaces; ns != NULL; ns = ns->next) {
-		if (ns->storage == &ctx->storage->storage.storage &&
-		    ns->alias_for == NULL) {
+	for (ns = storage->user->namespaces; ns != NULL; ns = ns->next) {
+		if (ns->storage == storage && ns->alias_for == NULL) {
 			if (rebuild_namespace_mailboxes(ctx, ns) < 0)
 				return -1;
 		}
 	}
+	if (ctx->default_list == NULL)
+		i_panic("No namespace found for storage=%s", storage->name);
 	return 0;
 }