From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 26 Jun 2017 15:23:01 +0000 (+0300)
Subject: lib-storage: Cleanup - Use mailbox_permissions_copy() instead of duplicating it
X-Git-Tag: 2.3.0.rc1~1338
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2f552aa8fb0fc86473c2d7dea85d8237373fb35f;p=thirdparty%2Fdovecot%2Fcore.git

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 832b58d13d..624960561c 100644
--- 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 f0707a27fa..c02dfb1ba1 100644
--- 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) {