From: Timo Sirainen <tss@iki.fi>
Date: Fri, 16 Sep 2011 13:01:29 +0000 (+0300)
Subject: lib-storage: Don't try to use the same mail_storage for shared storages.
X-Git-Tag: 2.1.alpha2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a2fad1afa0903cbe85992c26ed9b67bab3a3b21;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Don't try to use the same mail_storage for shared storages.
This fixes having multiple independent shared namespaces.
---

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index d4858efc14..bc83b798c5 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -260,6 +260,26 @@ mail_storage_create_root(struct mailbox_list *list,
 	}
 }
 
+static bool
+mail_storage_match_class(struct mail_storage *storage,
+			 const struct mail_storage *storage_class,
+			 const struct mailbox_list_settings *set)
+{
+	if (strcmp(storage->name, storage_class->name) != 0)
+		return FALSE;
+
+	if ((storage->class_flags & MAIL_STORAGE_CLASS_FLAG_UNIQUE_ROOT) != 0 &&
+	    strcmp(storage->unique_root_dir, set->root_dir) != 0)
+		return FALSE;
+
+	if (strcmp(storage->name, "shared") == 0) {
+		/* allow multiple independent shared namespaces */
+		return FALSE;
+	}
+
+	return storage;
+}
+
 static struct mail_storage *
 mail_storage_find(struct mail_user *user,
 		  const struct mail_storage *storage_class,
@@ -268,10 +288,7 @@ mail_storage_find(struct mail_user *user,
 	struct mail_storage *storage = user->storages;
 
 	for (; storage != NULL; storage = storage->next) {
-		if (strcmp(storage->name, storage_class->name) == 0 &&
-		    ((storage->class_flags &
-		      MAIL_STORAGE_CLASS_FLAG_UNIQUE_ROOT) == 0 ||
-		     strcmp(storage->unique_root_dir, set->root_dir) == 0))
+		if (mail_storage_match_class(storage, storage_class, set))
 			return storage;
 	}
 	return NULL;