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 b9e29703184d9cfed2604c65f686b174419e5f15..2f6a4a6b88a23a0739a3f7ec022189c7b2407f99 100644 (file)
--- 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 1fb72d64c94e3e921e4b15841528b3feb8d430f7..588cb3869302e60e968a96be33e4b7585b11f12f 100644 (file)
--- 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 8e4e9c22dedc7d082082b4a083ceac85bdbf5cdf..7c37315abda0d66acf1d89438851ecf93dfa241e 100644 (file)
--- 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,