From: Timo Sirainen <tss@iki.fi>
Date: Tue, 7 Apr 2009 22:01:57 +0000 (-0400)
Subject: Shared mailboxes: Fix to previous mailbox_open() change.
X-Git-Tag: 2.0.alpha1~1010
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b31ddaad0c05e2c63cfe45eae28094829e2a5c57;p=thirdparty%2Fdovecot%2Fcore.git

Shared mailboxes: Fix to previous mailbox_open() change.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/shared/shared-list.c b/src/lib-storage/index/shared/shared-list.c
index b9e2970318..2f6a4a6b88 100644
--- a/src/lib-storage/index/shared/shared-list.c
+++ b/src/lib-storage/index/shared/shared-list.c
@@ -43,12 +43,12 @@ static void shared_list_copy_error(struct mailbox_list *shared_list,
 }
 
 static int
-shared_get_storage(struct mailbox_list *list, const char *name,
+shared_get_storage(struct mailbox_list *list, const char **name,
 		   struct mail_storage **storage_r)
 {
 	struct mail_namespace *ns;
 
-	if (shared_storage_get_namespace(list->ns->storage, &name, &ns) < 0)
+	if (shared_storage_get_namespace(list->ns->storage, name, &ns) < 0)
 		return -1;
 	*storage_r = ns->storage;
 	return 0;
diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index 1fb72d64c9..588cb38693 100644
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -427,7 +427,7 @@ struct mailbox *mailbox_open(struct mail_storage **_storage, const char *name,
 	struct mailbox *box;
 
 	if (list->v.get_storage != NULL) {
-		if (list->v.get_storage(list, name, &storage) < 0)
+		if (list->v.get_storage(list, &name, &storage) < 0)
 			return NULL;
 		*_storage = storage;
 	}
diff --git a/src/lib-storage/mailbox-list-private.h b/src/lib-storage/mailbox-list-private.h
index 8e4e9c22de..7c37315abd 100644
--- a/src/lib-storage/mailbox-list-private.h
+++ b/src/lib-storage/mailbox-list-private.h
@@ -14,7 +14,7 @@ struct mailbox_list_vfuncs {
 	void (*deinit)(struct mailbox_list *list);
 
 	int (*get_storage)(struct mailbox_list *list,
-			   const char *name, struct mail_storage **storage_r);
+			   const char **name, struct mail_storage **storage_r);
 	bool (*is_valid_pattern)(struct mailbox_list *list,
 				 const char *pattern);
 	bool (*is_valid_existing_name)(struct mailbox_list *list,