From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 16 Sep 2021 16:32:02 +0000 (+0300)
Subject: acl: acl_backend_vfile_has_acl() - Simplify code
X-Git-Tag: 2.3.17~110
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=095089cd8f340b63c3ba91e69a832c3c119b85bd;p=thirdparty%2Fdovecot%2Fcore.git

acl: acl_backend_vfile_has_acl() - Simplify code
---

diff --git a/src/plugins/acl/acl-backend-vfile.c b/src/plugins/acl/acl-backend-vfile.c
index 8d70303c30..3ee0af996f 100644
--- a/src/plugins/acl/acl-backend-vfile.c
+++ b/src/plugins/acl/acl-backend-vfile.c
@@ -243,16 +243,16 @@ acl_backend_vfile_has_acl(struct acl_backend *_backend, const char *name)
 	if (backend->global_path == NULL) {
 		/* global ACLs disabled */
 		ret = 0;
+	} else if (_backend->global_file != NULL) {
+		/* check global ACL file */
+		ret = acl_global_file_refresh(_backend->global_file);
+		if (ret == 0 && acl_global_file_have_any(_backend->global_file, box->vname))
+			ret = 1;
 	} else {
-		if (_backend->global_file != NULL) {
-			ret = acl_global_file_refresh(_backend->global_file);
-			if (ret == 0 && acl_global_file_have_any(_backend->global_file, box->vname))
-				ret = 1;
-		} else {
-			global_path = t_strconcat(backend->global_path, "/", name, NULL);
-			ret = acl_backend_vfile_exists(backend, global_path,
-						       &new_validity.global_validity);
-		}
+		/* check global ACL directory */
+		global_path = t_strconcat(backend->global_path, "/", name, NULL);
+		ret = acl_backend_vfile_exists(backend, global_path,
+					       &new_validity.global_validity);
 	}
 
 	if (ret != 0) {