acl: Deinit will return 1 on non-empty

diff --git a/src/plugins/acl/acl-mailbox-list.c b/src/plugins/acl/acl-mailbox-list.c
index a4ffab61739148181ac38f0114014d004a914fb6..4ce5a608a759cdd13b997d2cf187663c730bc88b 100644 (file)
--- a/src/plugins/acl/acl-mailbox-list.c
+++ b/src/plugins/acl/acl-mailbox-list.c
@@ -128,7 +128,7 @@ acl_mailbox_try_list_fast(struct acl_mailbox_list_iterate_context *ctx)
                } T_END;
        }
 
-       if (acl_backend_nonowner_lookups_iter_deinit(&nonowner_list_ctx) == 0)
+       if (acl_backend_nonowner_lookups_iter_deinit(&nonowner_list_ctx) >= 0)
                ctx->lookup_boxes = update_ctx.tree_ctx;
        else
                mailbox_tree_deinit(&update_ctx.tree_ctx);

diff --git a/src/plugins/acl/acl-mailbox.c b/src/plugins/acl/acl-mailbox.c
index a1fea87af87f258018f1eb3743511cd2701ea89f..3a4f00e65130c464d88ae4e0e398b9cf61a3f9d2 100644 (file)
--- a/src/plugins/acl/acl-mailbox.c
+++ b/src/plugins/acl/acl-mailbox.c
@@ -638,7 +638,7 @@ acl_mailbox_update_removed_id(struct acl_object *aclobj,
                    null_strcmp(rights.identifier, update->rights.identifier) == 0)
                        break;
        }
-       return acl_object_list_deinit(&iter) == 0;
+       return acl_object_list_deinit(&iter) >= 0;
 }
 
 int acl_mailbox_update_acl(struct mailbox_transaction_context *t,