summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-06-15 09:48:20 +0200
committerMichael Adam <obnox@samba.org>2012-06-15 12:14:29 +0200
commit64fec465c15fea77313643636d82d2c14115f434 (patch)
treec19360025c1811b3a765bc9e322aa903ebbfc8e0
parent07d6c25525ca3b0d3a4e179f1048818f78cccf9d (diff)
downloadsamba-64fec465c15fea77313643636d82d2c14115f434.tar.gz
samba-64fec465c15fea77313643636d82d2c14115f434.tar.bz2
samba-64fec465c15fea77313643636d82d2c14115f434.zip
dbwrap: dbwrap_trans_store_int32->dbwrap_trans_store_int32_bystring
Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--lib/dbwrap/dbwrap.h5
-rw-r--r--lib/dbwrap/dbwrap_util.c5
-rw-r--r--source3/registry/reg_backend_db.c3
-rw-r--r--source3/utils/dbwrap_tool.c2
-rw-r--r--source3/winbindd/idmap_autorid.c2
5 files changed, 10 insertions, 7 deletions
diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index 8831c4ca02..bf172d22cd 100644
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -112,8 +112,9 @@ NTSTATUS dbwrap_trans_change_int32_atomic_bystring(struct db_context *db,
NTSTATUS dbwrap_trans_store(struct db_context *db, TDB_DATA key, TDB_DATA dbuf,
int flag);
NTSTATUS dbwrap_trans_delete(struct db_context *db, TDB_DATA key);
-NTSTATUS dbwrap_trans_store_int32(struct db_context *db, const char *keystr,
- int32_t v);
+NTSTATUS dbwrap_trans_store_int32_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t v);
NTSTATUS dbwrap_trans_store_uint32(struct db_context *db, const char *keystr,
uint32_t v);
NTSTATUS dbwrap_trans_store_bystring(struct db_context *db, const char *key,
diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 1de53759f9..15736b351a 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -380,8 +380,9 @@ NTSTATUS dbwrap_trans_delete(struct db_context *db, TDB_DATA key)
return status;
}
-NTSTATUS dbwrap_trans_store_int32(struct db_context *db, const char *keystr,
- int32_t v)
+NTSTATUS dbwrap_trans_store_int32_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t v)
{
int32_t v_store;
diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index 2e8cef75fa..8fe1b8e61c 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -485,7 +485,8 @@ static WERROR regdb_store_regdb_version(struct db_context *db, uint32_t version)
return WERR_CAN_NOT_COMPLETE;
}
- status = dbwrap_trans_store_int32(db, REGDB_VERSION_KEYNAME, version);
+ status = dbwrap_trans_store_int32_bystring(db, REGDB_VERSION_KEYNAME,
+ version);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("regdb_store_regdb_version: error storing %s = %d: %s\n",
REGDB_VERSION_KEYNAME, version, nt_errstr(status)));
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index 6fb58090e0..72e70690bf 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -136,7 +136,7 @@ static int dbwrap_tool_store_int32(struct db_context *db,
NTSTATUS status;
int32_t value = (int32_t)strtol(data, NULL, 10);
- status = dbwrap_trans_store_int32(db, keyname, value);
+ status = dbwrap_trans_store_int32_bystring(db, keyname, value);
if (!NT_STATUS_IS_OK(status)) {
d_fprintf(stderr, "ERROR: could not store int32 key '%s': %s\n",
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 26811a863c..3f3f649a22 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -608,7 +608,7 @@ static NTSTATUS idmap_autorid_init_hwm(const char *hwm) {
status = dbwrap_fetch_uint32_bystring(autorid_db, hwm, &hwmval);
if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
- status = dbwrap_trans_store_int32(autorid_db, hwm, 0);
+ status = dbwrap_trans_store_int32_bystring(autorid_db, hwm, 0);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,
("Unable to initialise HWM (%s) in autorid "