dbwrap: dbwrap_store_uint32->dbwrap_store_uint32_bystring

Signed-off-by: Michael Adam <obnox@samba.org>

8 files changed, 19 insertions, 14 deletions

diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index 01425115b7..d0df1e5afa 100644
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -91,8 +91,8 @@ NTSTATUS dbwrap_store_int32_bystring(struct db_context *db, const char *keystr,
 				     int32_t v);
 NTSTATUS dbwrap_fetch_uint32_bystring(struct db_context *db,
 				      const char *keystr, uint32_t *val);
-NTSTATUS dbwrap_store_uint32(struct db_context *db, const char *keystr,
-			     uint32_t v);
+NTSTATUS dbwrap_store_uint32_bystring(struct db_context *db,
+				      const char *keystr, uint32_t v);
 NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
 				     uint32_t *oldval, uint32_t change_val);
 NTSTATUS dbwrap_trans_change_uint32_atomic(struct db_context *db,
diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 7acc3b5e56..21f2a80950 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -99,8 +99,8 @@ NTSTATUS dbwrap_fetch_uint32_bystring(struct db_context *db,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS dbwrap_store_uint32(struct db_context *db, const char *keystr,
-			     uint32_t v)
+NTSTATUS dbwrap_store_uint32_bystring(struct db_context *db,
+				      const char *keystr, uint32_t v)
 {
 	struct db_record *rec;
 	uint32_t v_store;
diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c
index 9c6f40107a..fa2252f1a7 100644
--- a/source3/passdb/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -266,7 +266,8 @@ bool init_account_policy(void)
 	}
 
 	if (version != DATABASE_VERSION) {
-		status = dbwrap_store_uint32(db, vstring, DATABASE_VERSION);
+		status = dbwrap_store_uint32_bystring(db, vstring,
+						      DATABASE_VERSION);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(0, ("dbwrap_store_uint32 failed: %s\n",
 				  nt_errstr(status)));
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index 43e561bd93..e77ab8f1a7 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -347,7 +347,7 @@ static bool tdbsam_upgrade_next_rid(struct db_context *db)
 		rid = BASE_RID;
 	}
 
-	status = dbwrap_store_uint32(db, NEXT_RID_STRING, rid);
+	status = dbwrap_store_uint32_bystring(db, NEXT_RID_STRING, rid);
 	if (!NT_STATUS_IS_OK(status)) {
 		return false;
 	}
diff --git a/source3/torture/test_idmap_tdb_common.c b/source3/torture/test_idmap_tdb_common.c
index 7e7c5dd2b6..d08166017a 100644
--- a/source3/torture/test_idmap_tdb_common.c
+++ b/source3/torture/test_idmap_tdb_common.c
@@ -103,13 +103,15 @@ static bool open_db(struct idmap_tdb_common_context *ctx)
 		return false;
 	}
 
-	status = dbwrap_store_uint32(ctx->db, ctx->hwmkey_uid, LOW_ID);
+	status = dbwrap_store_uint32_bystring(ctx->db, ctx->hwmkey_uid,
+					      LOW_ID);
 	if(!NT_STATUS_IS_OK(status)) {
 		dbwrap_transaction_cancel(ctx->db);
 		return false;
 	}
 
-	status = dbwrap_store_uint32(ctx->db, ctx->hwmkey_gid, LOW_ID);
+	status = dbwrap_store_uint32_bystring(ctx->db, ctx->hwmkey_gid,
+					      LOW_ID);
 	if(!NT_STATUS_IS_OK(status)) {
 		dbwrap_transaction_cancel(ctx->db);
 		return false;
diff --git a/source3/utils/net_registry_check.c b/source3/utils/net_registry_check.c
index d6c577b89a..872aa5a371 100644
--- a/source3/utils/net_registry_check.c
+++ b/source3/utils/net_registry_check.c
@@ -940,7 +940,7 @@ dbwrap_store_uint32_verbose(struct db_context *db, const char *key, uint32_t nva
 		goto done;
 	}
 
-	status = dbwrap_store_uint32(db, key, nval);
+	status = dbwrap_store_uint32_bystring(db, key, nval);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf ("store %s failed: %s\n", key, nt_errstr(status));
 	}
@@ -1259,8 +1259,8 @@ static bool check_ctx_write_new_db(struct check_ctx *ctx) {
 		return false;
 	}
 
-	status = dbwrap_store_uint32(ctx->odb,
-				     "INFO/version", ctx->version);
+	status = dbwrap_store_uint32_bystring(ctx->odb, "INFO/version",
+					      ctx->version);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("write version failed: %s\n", nt_errstr(status)));
 		return false;
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index d02f34e573..a890914a47 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -102,7 +102,7 @@ static NTSTATUS idmap_autorid_get_domainrange_action(struct db_context *db,
 	}
 
 	/* store away the new mapping in both directions */
-	ret = dbwrap_store_uint32(db, cfg->sid, domainnum);
+	ret = dbwrap_store_uint32_bystring(db, cfg->sid, domainnum);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(1, ("Fatal error while storing new "
 			  "domain->range assignment!\n"));
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 4c3b4b190a..365d78cafc 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -278,7 +278,8 @@ static NTSTATUS idmap_tdb_init_hwm(struct idmap_domain *dom)
 	}
 
 	if (update_uid) {
-		status = dbwrap_store_uint32(ctx->db, HWM_USER, dom->low_id);
+		status = dbwrap_store_uint32_bystring(ctx->db, HWM_USER,
+						      dom->low_id);
 		if (!NT_STATUS_IS_OK(status)) {
 			dbwrap_transaction_cancel(ctx->db);
 			DEBUG(0, ("Unable to initialise user hwm in idmap "
@@ -288,7 +289,8 @@ static NTSTATUS idmap_tdb_init_hwm(struct idmap_domain *dom)
 	}
 
 	if (update_gid) {
-		status = dbwrap_store_uint32(ctx->db, HWM_GROUP, dom->low_id);
+		status = dbwrap_store_uint32_bystring(ctx->db, HWM_GROUP,
+						      dom->low_id);
 		if (!NT_STATUS_IS_OK(status)) {
 			dbwrap_transaction_cancel(ctx->db);
 			DEBUG(0, ("Unable to initialise group hwm in idmap "