diff options
| author | Michael Adam <obnox@samba.org> | 2011-10-06 20:28:39 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-10-11 14:17:58 +0200 |
| commit | ce8626cbbe99b26f4e39ace87221792b468b9c93 (patch) | |
| tree | 806dc901c4bbd596e37c9f2749ca094701c628e9 | |
| parent | ba88e4e0d86302e7efe2398d5be5cfb32c0dbdeb (diff) | |
| download | samba-ce8626cbbe99b26f4e39ace87221792b468b9c93.tar.gz samba-ce8626cbbe99b26f4e39ace87221792b468b9c93.tar.bz2 samba-ce8626cbbe99b26f4e39ace87221792b468b9c93.zip | |
s3:idmap_tdb2: fix hwm-handling to use uint32 consistently
The initialization code user int32, later writes used uint32...
| -rw-r--r-- | source3/winbindd/idmap_tdb2.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c index 456bb8f509..0f50f615a1 100644 --- a/source3/winbindd/idmap_tdb2.c +++ b/source3/winbindd/idmap_tdb2.c @@ -63,15 +63,16 @@ 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 */ - low_id = dbwrap_fetch_int32(ctx->db, HWM_USER); - if ((low_id == -1) || (low_id < dom->low_id)) { - status = dbwrap_trans_store_int32(ctx->db, HWM_USER, - dom->low_id); + ret = dbwrap_fetch_uint32(ctx->db, HWM_USER, &low_id); + if (!ret || (low_id < dom->low_id)) { + status = dbwrap_trans_store_uint32(ctx->db, HWM_USER, + dom->low_id); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Unable to initialise user hwm in idmap " "database: %s\n", nt_errstr(status))); @@ -79,10 +80,10 @@ static NTSTATUS idmap_tdb2_init_hwm(struct idmap_domain *dom) } } - low_id = dbwrap_fetch_int32(ctx->db, HWM_GROUP); - if ((low_id == -1) || (low_id < dom->low_id)) { - status = dbwrap_trans_store_int32(ctx->db, HWM_GROUP, - dom->low_id); + ret = dbwrap_fetch_uint32(ctx->db, HWM_GROUP, &low_id); + if (!ret || (low_id < dom->low_id)) { + status = dbwrap_trans_store_uint32(ctx->db, HWM_GROUP, + dom->low_id); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("Unable to initialise group hwm in idmap " "database: %s\n", nt_errstr(status))); @@ -143,11 +144,12 @@ 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; - hwm = dbwrap_fetch_int32(db, state->hwmkey); - if (hwm == -1) { + ret2 = dbwrap_fetch_uint32(db, state->hwmkey, &hwm); + if (!ret2) { ret = NT_STATUS_INTERNAL_DB_ERROR; goto done; } |