From c0ea758cc7b1ba6c3a548a38fc34488f7e16728b Mon Sep 17 00:00:00 2001 From: Markus Valentin Date: Thu, 6 May 2021 10:18:10 +0200 Subject: [PATCH] acl: Move static acl_namespace_is_ignored --- src/plugins/acl/acl-mailbox-list.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/plugins/acl/acl-mailbox-list.c b/src/plugins/acl/acl-mailbox-list.c index d217b795c5..4158b6c5a3 100644 --- a/src/plugins/acl/acl-mailbox-list.c +++ b/src/plugins/acl/acl-mailbox-list.c @@ -524,6 +524,19 @@ static void acl_storage_rights_ctx_init(struct acl_storage_rights_context *ctx, } } +static bool acl_namespace_is_ignored(struct mailbox_list *list) +{ + const char *value = + mail_user_plugin_getenv(list->ns->user, "acl_ignore_namespace"); + for (unsigned int i = 2; value != NULL; i++) { + if (wildcard_match(list->ns->prefix, value)) + return TRUE; + value = mail_user_plugin_getenv(list->ns->user, + t_strdup_printf("acl_ignore_namespace%u", i)); + } + return FALSE; +} + static void acl_mailbox_list_init_default(struct mailbox_list *list) { struct mailbox_list_vfuncs *v = list->vlast; @@ -578,19 +591,6 @@ void acl_mail_namespace_storage_added(struct mail_namespace *ns) acl_storage_rights_ctx_init(&alist->rights, backend); } -static bool acl_namespace_is_ignored(struct mailbox_list *list) -{ - const char *value = - mail_user_plugin_getenv(list->ns->user, "acl_ignore_namespace"); - for (unsigned int i = 2; value != NULL; i++) { - if (wildcard_match(list->ns->prefix, value)) - return TRUE; - value = mail_user_plugin_getenv(list->ns->user, - t_strdup_printf("acl_ignore_namespace%u", i)); - } - return FALSE; -} - void acl_mailbox_list_created(struct mailbox_list *list) { struct acl_user *auser = ACL_USER_CONTEXT(list->ns->user); -- 2.47.3