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 8d70303c30ce6aca600590284f25b19611da2f73..3ee0af996f0f92bc9a565d818e06799ef09c0745 100644 (file)
--- 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) {