From 830af9a96d4f08c0165afbfd6bf31099d8753d13 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 29 May 2017 17:58:35 +0300 Subject: [PATCH] acl: Global ACL file was parsed as if it was local ACL file This caused some of the ACL handling not work exactly as expected. --- src/plugins/acl/acl-global-file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/acl/acl-global-file.c b/src/plugins/acl/acl-global-file.c index 6b3fb13b7a..5ba47fc186 100644 --- a/src/plugins/acl/acl-global-file.c +++ b/src/plugins/acl/acl-global-file.c @@ -105,8 +105,11 @@ acl_global_file_parse_line(struct acl_global_file_parse_ctx *ctx, pright = array_append_space(&ctx->parse_rights); pright->vpattern = p_strdup(ctx->file->rights_pool, vpattern); - return acl_rights_parse_line(line, ctx->file->rights_pool, - &pright->rights, error_r); + if (acl_rights_parse_line(line, ctx->file->rights_pool, + &pright->rights, error_r) < 0) + return -1; + pright->rights.global = TRUE; + return 0; } static int acl_global_file_read(struct acl_global_file *file)