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 832b58d13ded5ede7b40e13802eee7932fb3553e..624960561c358716faa76d09a60188356803c111 100644 (file)
--- a/src/lib-storage/mail-storage.c
+++ b/src/lib-storage/mail-storage.c
@@ -2554,9 +2554,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 f0707a27faafb132c754c9f645b1eea435b6fcaa..c02dfb1ba14393bab211f14be6eb5f50a2e64be0 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -997,10 +997,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) {