lib-storage: Cleanup - Use mailbox_permissions_copy() instead of duplicating it

diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c
index c94a7ddf53f7b04f0e206d2def2988b7d9b33af1..fe123f2e092c1c973e0a76316088f42306cdae2a 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -2549,9 +2549,9 @@ static void mailbox_get_permissions_if_not_set(struct mailbox *box)
                return;
        }
 
-       mailbox_list_get_permissions(box->list, box->name, &box->_perm);
-       box->_perm.file_create_gid_origin =
-               p_strdup(box->pool, box->_perm.file_create_gid_origin);
+       struct mailbox_permissions perm;
+       mailbox_list_get_permissions(box->list, box->name, &perm);
+       mailbox_permissions_copy(&box->_perm, &perm, box->pool);
 }
 
 const struct mailbox_permissions *mailbox_get_permissions(struct mailbox *box)

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index 3eb2d38af75e9806c5215fa5d7a9a97b4605b1a6..1da9f7afd6c04ec94ffe477dcf81ed00d895db5b 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -992,10 +992,8 @@ mailbox_list_get_permissions_internal(struct mailbox_list *list,
        }
 
        if (name == NULL) {
-               list->root_permissions = *permissions_r;
-               list->root_permissions.file_create_gid_origin =
-                       p_strdup(list->pool,
-                                permissions_r->file_create_gid_origin);
+               mailbox_permissions_copy(&list->root_permissions, permissions_r,
+                                        list->pool);
        }
 
        if (list->mail_set->mail_debug && name == NULL) {