From: Aki Tuomi Date: Thu, 8 Sep 2016 19:59:58 +0000 (+0300) Subject: acl: Deinit will return 1 on non-empty X-Git-Tag: 2.3.0.rc1~3064 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bbc7e2c2e726cf84da49f4062d05b0c35a9377bd;p=thirdparty%2Fdovecot%2Fcore.git 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 a4ffab6173..4ce5a608a7 100644 --- 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 a1fea87af8..3a4f00e651 100644 --- 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,