From 56c80d1c829978ac394a022ff2e069c2ccfee5b4 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 28 Aug 2013 14:32:19 +0200 Subject: idmap_autorid: refactor idmap_autorid_loadconfig to use idmap_config_getconfigstr Pair-Programmed-with: Atul Kulkarni Signed-off-by: Michael Adam Signed-off-by: Atul Kulkarni Reviewed-by: Volker Lendecke --- source3/winbindd/idmap_autorid_tdb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source3/winbindd') diff --git a/source3/winbindd/idmap_autorid_tdb.c b/source3/winbindd/idmap_autorid_tdb.c index 6933c9e31e..1673f19674 100644 --- a/source3/winbindd/idmap_autorid_tdb.c +++ b/source3/winbindd/idmap_autorid_tdb.c @@ -264,16 +264,13 @@ NTSTATUS idmap_autorid_getconfigstr(struct db_context *db, TALLOC_CTX *mem_ctx, struct autorid_global_config *idmap_autorid_loadconfig(struct db_context *db, TALLOC_CTX *ctx) { - - TDB_DATA data; struct autorid_global_config *cfg; unsigned long minvalue, rangesize, maxranges; NTSTATUS status; + char *configstr = NULL; - status = dbwrap_fetch_bystring(db, ctx, CONFIGKEY, &data); - + status = idmap_autorid_getconfigstr(db, ctx, &configstr); if (!NT_STATUS_IS_OK(status)) { - DEBUG(10, ("No saved config found\n")); return NULL; } @@ -282,7 +279,7 @@ struct autorid_global_config *idmap_autorid_loadconfig(struct db_context *db, return NULL; } - if (sscanf((char *)data.dptr, + if (sscanf(configstr, "minvalue:%lu rangesize:%lu maxranges:%lu", &minvalue, &rangesize, &maxranges) != 3) { DEBUG(1, -- cgit