From 7f19a5ab52ac6ecb380a49ec14072d0fd501f9db Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 14 Jun 2012 20:39:27 +0200 Subject: dbwrap: dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring Signed-off-by: Michael Adam --- source3/utils/dbwrap_tool.c | 2 +- source3/utils/net_idmap_check.c | 4 ++-- source3/utils/net_registry_check.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c index 677a9adeb4..6fb58090e0 100644 --- a/source3/utils/dbwrap_tool.c +++ b/source3/utils/dbwrap_tool.c @@ -59,7 +59,7 @@ static int dbwrap_tool_fetch_uint32(struct db_context *db, uint32_t value; NTSTATUS ret; - ret = dbwrap_fetch_uint32(db, keyname, &value); + ret = dbwrap_fetch_uint32_bystring(db, keyname, &value); if (NT_STATUS_IS_OK(ret)) { d_printf("%u\n", value); return 0; diff --git a/source3/utils/net_idmap_check.c b/source3/utils/net_idmap_check.c index 1269410bee..4174238298 100644 --- a/source3/utils/net_idmap_check.c +++ b/source3/utils/net_idmap_check.c @@ -394,7 +394,7 @@ static bool check_version(struct check_ctx* ctx) { char action = 's'; struct check_actions* act = &ctx->action; - status = dbwrap_fetch_uint32(ctx->db, key, &version); + status = dbwrap_fetch_uint32_bystring(ctx->db, key, &version); if (!NT_STATUS_IS_OK(status)) { d_printf("No version number, assume 2\n"); action = get_action(&act->no_version, NULL, NULL); @@ -424,7 +424,7 @@ static void check_hwm(struct check_ctx* ctx, const char* key, uint32_t target) { NTSTATUS status; struct check_actions* act = &ctx->action; - status = dbwrap_fetch_uint32(ctx->db, key, &hwm); + status = dbwrap_fetch_uint32_bystring(ctx->db, key, &hwm); if (!NT_STATUS_IS_OK(status)) { d_printf("No %s should be %d\n", key, target); action = get_action(&act->invalid_hwm, NULL, NULL); diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c index 58cd9f6054..d6c577b89a 100644 --- a/source3/utils/net_registry_check.c +++ b/source3/utils/net_registry_check.c @@ -844,7 +844,8 @@ static bool get_version(struct check_ctx *ctx) { uint32_t info_version = 0; NTSTATUS status; - status = dbwrap_fetch_uint32(ctx->idb, "INFO/version", &info_version); + status = dbwrap_fetch_uint32_bystring(ctx->idb, "INFO/version", + &info_version); if (!NT_STATUS_IS_OK(status)) { printf("Warning: no INFO/version found!\n"); /* info_version = guess_version(ctx); */ @@ -923,7 +924,7 @@ dbwrap_store_uint32_verbose(struct db_context *db, const char *key, uint32_t nva uint32_t oval; NTSTATUS status; - status = dbwrap_fetch_uint32(db, key, &oval); + status = dbwrap_fetch_uint32_bystring(db, key, &oval); if (NT_STATUS_IS_OK(status)) { if (nval == oval) { goto done; -- cgit