s3:dbwrap: change dbwrap_fetch_uint32() to NTSTATUS return type (instead of bool)

[amitay/samba.git] / source3 / winbindd / idmap_tdb2.c

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 0f50f615a13b31df676df1b9d5810cd09fa64075..ab47fe5389d2b2f8ab32a0d5854c7f131412f2b9 100644 (file)
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -63,14 +63,13 @@ static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
        NTSTATUS status;
        uint32 low_id;
        struct idmap_tdb2_context *ctx;
-       bool ret;
 
        ctx = talloc_get_type(dom->private_data, struct idmap_tdb2_context);
 
        /* Create high water marks for group and user id */
 
-       ret = dbwrap_fetch_uint32(ctx->db, HWM_USER, &low_id);
-       if (!ret || (low_id < dom->low_id)) {
+       status = dbwrap_fetch_uint32(ctx->db, HWM_USER, &low_id);
+       if (!NT_STATUS_IS_OK(status) || (low_id < dom->low_id)) {
                status = dbwrap_trans_store_uint32(ctx->db, HWM_USER,
                                                   dom->low_id);
                if (!NT_STATUS_IS_OK(status)) {
@@ -80,8 +79,8 @@ static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom)
                }
        }
 
-       ret = dbwrap_fetch_uint32(ctx->db, HWM_GROUP, &low_id);
-       if (!ret || (low_id < dom->low_id)) {
+       status = dbwrap_fetch_uint32(ctx->db, HWM_GROUP, &low_id);
+       if (!NT_STATUS_IS_OK(status) || (low_id < dom->low_id)) {
                status = dbwrap_trans_store_uint32(ctx->db, HWM_GROUP,
                                                   dom->low_id);
                if (!NT_STATUS_IS_OK(status)) {
@@ -144,12 +143,11 @@ static NTSTATUS idmap_tdb2_allocate_id_action(struct db_context *db,
        NTSTATUS ret;
        struct idmap_tdb2_allocate_id_context *state;
        uint32_t hwm;
-       bool ret2;
 
        state = (struct idmap_tdb2_allocate_id_context *)private_data;
 
-       ret2 = dbwrap_fetch_uint32(db, state->hwmkey, &hwm);
-       if (!ret2) {
+       ret = dbwrap_fetch_uint32(db, state->hwmkey, &hwm);
+       if (!NT_STATUS_IS_OK(ret)) {
                ret = NT_STATUS_INTERNAL_DB_ERROR;
                goto done;
        }