Mercurial > dovecot > core-2.2

changeset 22294:948b471d551d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-storage: Cleanup - Use mailbox_permissions_copy() instead of duplicating it
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Mon, 26 Jun 2017 18:23:01 +0300
parents b8a501c91a39
children cebd11880aea
files src/lib-storage/mail-storage.c src/lib-storage/mailbox-list.c
diffstat 2 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-storage/mail-storage.c	Mon Jun 26 18:19:17 2017 +0300
+++ b/src/lib-storage/mail-storage.c	Mon Jun 26 18:23:01 2017 +0300
@@ -2549,9 +2549,9 @@
 		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)
--- a/src/lib-storage/mailbox-list.c	Mon Jun 26 18:19:17 2017 +0300
+++ b/src/lib-storage/mailbox-list.c	Mon Jun 26 18:23:01 2017 +0300
@@ -992,10 +992,8 @@
 	}
 
 	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) {