The branch, master has been updated
via 1d9ff7d dbwrap:
dbwrap_trans_store_uint32->dbwrap_trans_store_uint32_bystring
via 64fec46 dbwrap:
dbwrap_trans_store_int32->dbwrap_trans_store_int32_bystring
via 07d6c25 dbwrap:
dbwrap_trans_change_int32_atomic->dbwrap_trans_change_int32_atomic_bystring
via 8b99d40 dbwrap:
dbwrap_change_int32_atomic->dbwrap_change_int32_atomic_bystring
via 9275d57 dbwrap:
dbwrap_trans_change_uint32_atomic->dbwrap_trans_change_uint32_atomic_bystring
via 37ad03f dbwrap:
dbwrap_change_uint32_atomic->dbwrap_change_uint32_atomic_bystring
via 8f94ecb dbwrap: dbwrap_store_uint32->dbwrap_store_uint32_bystring
via 7f19a5a dbwrap: dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring
via 749314f dbwrap: dbwrap_store_int32->dbwrap_store_int32_bystring
via 737c0a5 dbwrap: dbwrap_fetch_int32->dbwrap_fetch_int32_bystring
from 9afd4be s3-build: Do not write loadparm generated files into the
build tree
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1d9ff7d3bc111f83f8ae45277c0507c4306c0c01
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:51:21 2012 +0200
dbwrap: dbwrap_trans_store_uint32->dbwrap_trans_store_uint32_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
Autobuild-User(master): Michael Adam <ob...@samba.org>
Autobuild-Date(master): Fri Jun 15 14:20:04 CEST 2012 on sn-devel-104
commit 64fec465c15fea77313643636d82d2c14115f434
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:48:20 2012 +0200
dbwrap: dbwrap_trans_store_int32->dbwrap_trans_store_int32_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 07d6c25525ca3b0d3a4e179f1048818f78cccf9d
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:45:18 2012 +0200
dbwrap:
dbwrap_trans_change_int32_atomic->dbwrap_trans_change_int32_atomic_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 8b99d40520875ad89e14d9397cff902f8198fd25
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:43:13 2012 +0200
dbwrap: dbwrap_change_int32_atomic->dbwrap_change_int32_atomic_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 9275d571d9d0bb4b7927245256aa4510b9e7c43d
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:20:25 2012 +0200
dbwrap:
dbwrap_trans_change_uint32_atomic->dbwrap_trans_change_uint32_atomic_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 37ad03f91d28c39533ece09384a12e63603c3e8a
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:18:17 2012 +0200
dbwrap: dbwrap_change_uint32_atomic->dbwrap_change_uint32_atomic_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 8f94ecbb90f3efedc3e379853dd71369d53cb1f7
Author: Volker Lendecke <v...@samba.org>
Date: Fri Jun 15 09:09:57 2012 +0200
dbwrap: dbwrap_store_uint32->dbwrap_store_uint32_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 7f19a5ab52ac6ecb380a49ec14072d0fd501f9db
Author: Volker Lendecke <v...@samba.org>
Date: Thu Jun 14 20:39:27 2012 +0200
dbwrap: dbwrap_fetch_uint32->dbwrap_fetch_uint32_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 749314fcf99cef4a1a162d622e10b6eb8998938f
Author: Volker Lendecke <v...@samba.org>
Date: Thu Jun 14 20:30:16 2012 +0200
dbwrap: dbwrap_store_int32->dbwrap_store_int32_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
commit 737c0a54731803c84f0f29d96dd40ac819aec3e8
Author: Volker Lendecke <v...@samba.org>
Date: Thu Jun 14 20:26:28 2012 +0200
dbwrap: dbwrap_fetch_int32->dbwrap_fetch_int32_bystring
Signed-off-by: Michael Adam <ob...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/dbwrap/dbwrap.h | 54 +++++++++++++++++--------------
lib/dbwrap/dbwrap_util.c | 54 +++++++++++++++++--------------
source3/lib/sharesec.c | 16 ++++----
source3/passdb/account_pol.c | 11 +++---
source3/passdb/pdb_tdb.c | 31 +++++++++--------
source3/passdb/secrets.c | 4 +-
source3/registry/reg_backend_db.c | 9 +++--
source3/torture/test_dbwrap_watch.c | 2 +-
source3/torture/test_idmap_tdb_common.c | 6 ++-
source3/torture/torture.c | 4 +-
source3/utils/dbwrap_tool.c | 8 ++--
source3/utils/net_idmap.c | 6 ++-
source3/utils/net_idmap_check.c | 4 +-
source3/utils/net_registry_check.c | 11 +++---
source3/winbindd/idmap_autorid.c | 17 +++++----
source3/winbindd/idmap_tdb.c | 25 ++++++++------
source3/winbindd/idmap_tdb_common.c | 4 +-
17 files changed, 146 insertions(+), 120 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/dbwrap/dbwrap.h b/lib/dbwrap/dbwrap.h
index 59e5af0..41bcf35 100644
--- a/lib/dbwrap/dbwrap.h
+++ b/lib/dbwrap/dbwrap.h
@@ -85,33 +85,39 @@ NTSTATUS dbwrap_store_bystring(struct db_context *db, const
char *key,
NTSTATUS dbwrap_fetch_bystring(struct db_context *db, TALLOC_CTX *mem_ctx,
const char *key, TDB_DATA *value);
-NTSTATUS dbwrap_fetch_int32(struct db_context *db, const char *keystr,
- int32_t *result);
-NTSTATUS dbwrap_store_int32(struct db_context *db, const char *keystr,
- int32_t v);
-NTSTATUS dbwrap_fetch_uint32(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_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,
- const char *keystr,
- uint32_t *oldval,
- uint32_t change_val);
-NTSTATUS dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
- int32_t *oldval, int32_t change_val);
-NTSTATUS dbwrap_trans_change_int32_atomic(struct db_context *db,
- const char *keystr,
- int32_t *oldval,
- int32_t change_val);
+NTSTATUS dbwrap_fetch_int32_bystring(struct db_context *db, const char *keystr,
+ int32_t *result);
+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_bystring(struct db_context *db,
+ const char *keystr, uint32_t v);
+NTSTATUS dbwrap_change_uint32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ uint32_t *oldval,
+ uint32_t change_val);
+NTSTATUS dbwrap_trans_change_uint32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ uint32_t *oldval,
+ uint32_t change_val);
+NTSTATUS dbwrap_change_int32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t *oldval,
+ int32_t change_val);
+NTSTATUS dbwrap_trans_change_int32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t *oldval,
+ int32_t change_val);
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_uint32(struct db_context *db, const char *keystr,
- uint32_t v);
+NTSTATUS dbwrap_trans_store_int32_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t v);
+NTSTATUS dbwrap_trans_store_uint32_bystring(struct db_context *db,
+ const char *keystr,
+ uint32_t v);
NTSTATUS dbwrap_trans_store_bystring(struct db_context *db, const char *key,
TDB_DATA data, int flags);
NTSTATUS dbwrap_trans_delete_bystring(struct db_context *db, const char *key);
diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 314a552..8e6498d 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -26,8 +26,8 @@
#include "dbwrap.h"
#include "lib/util/util_tdb.h"
-NTSTATUS dbwrap_fetch_int32(struct db_context *db, const char *keystr,
- int32_t *result)
+NTSTATUS dbwrap_fetch_int32_bystring(struct db_context *db, const char *keystr,
+ int32_t *result)
{
TDB_DATA dbuf;
NTSTATUS status;
@@ -51,8 +51,8 @@ NTSTATUS dbwrap_fetch_int32(struct db_context *db, const char
*keystr,
return NT_STATUS_OK;
}
-NTSTATUS dbwrap_store_int32(struct db_context *db, const char *keystr,
- int32_t v)
+NTSTATUS dbwrap_store_int32_bystring(struct db_context *db, const char *keystr,
+ int32_t v)
{
struct db_record *rec;
int32_t v_store;
@@ -74,8 +74,8 @@ NTSTATUS dbwrap_store_int32(struct db_context *db, const char
*keystr,
return status;
}
-NTSTATUS dbwrap_fetch_uint32(struct db_context *db, const char *keystr,
- uint32_t *val)
+NTSTATUS dbwrap_fetch_uint32_bystring(struct db_context *db,
+ const char *keystr, uint32_t *val)
{
TDB_DATA dbuf;
NTSTATUS status;
@@ -99,8 +99,8 @@ NTSTATUS dbwrap_fetch_uint32(struct db_context *db, const
char *keystr,
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;
@@ -180,8 +180,10 @@ done:
return ret;
}
-NTSTATUS dbwrap_change_uint32_atomic(struct db_context *db, const char *keystr,
- uint32_t *oldval, uint32_t change_val)
+NTSTATUS dbwrap_change_uint32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ uint32_t *oldval,
+ uint32_t change_val)
{
NTSTATUS ret;
struct dbwrap_change_uint32_atomic_context state;
@@ -195,10 +197,10 @@ NTSTATUS dbwrap_change_uint32_atomic(struct db_context
*db, const char *keystr,
return ret;
}
-NTSTATUS dbwrap_trans_change_uint32_atomic(struct db_context *db,
- const char *keystr,
- uint32_t *oldval,
- uint32_t change_val)
+NTSTATUS dbwrap_trans_change_uint32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ uint32_t *oldval,
+ uint32_t change_val)
{
NTSTATUS ret;
struct dbwrap_change_uint32_atomic_context state;
@@ -270,8 +272,10 @@ done:
return ret;
}
-NTSTATUS dbwrap_change_int32_atomic(struct db_context *db, const char *keystr,
- int32_t *oldval, int32_t change_val)
+NTSTATUS dbwrap_change_int32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t *oldval,
+ int32_t change_val)
{
NTSTATUS ret;
struct dbwrap_change_int32_atomic_context state;
@@ -285,10 +289,10 @@ NTSTATUS dbwrap_change_int32_atomic(struct db_context
*db, const char *keystr,
return ret;
}
-NTSTATUS dbwrap_trans_change_int32_atomic(struct db_context *db,
- const char *keystr,
- int32_t *oldval,
- int32_t change_val)
+NTSTATUS dbwrap_trans_change_int32_atomic_bystring(struct db_context *db,
+ const char *keystr,
+ int32_t *oldval,
+ int32_t change_val)
{
NTSTATUS ret;
struct dbwrap_change_int32_atomic_context state;
@@ -376,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;
@@ -389,8 +394,9 @@ NTSTATUS dbwrap_trans_store_int32(struct db_context *db,
const char *keystr,
TDB_REPLACE);
}
-NTSTATUS dbwrap_trans_store_uint32(struct db_context *db, const char *keystr,
- uint32_t v)
+NTSTATUS dbwrap_trans_store_uint32_bystring(struct db_context *db,
+ const char *keystr,
+ uint32_t v)
{
uint32_t v_store;
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index cb8993c..978edf2 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -156,7 +156,7 @@ bool share_info_db_init(void)
return False;
}
- status = dbwrap_fetch_int32(share_db, vstring, &vers_id);
+ status = dbwrap_fetch_int32_bystring(share_db, vstring, &vers_id);
if (!NT_STATUS_IS_OK(status)) {
vers_id = 0;
}
@@ -171,7 +171,7 @@ bool share_info_db_init(void)
return false;
}
- status = dbwrap_fetch_int32(share_db, vstring, &vers_id);
+ status = dbwrap_fetch_int32_bystring(share_db, vstring, &vers_id);
if (!NT_STATUS_IS_OK(status)) {
vers_id = 0;
}
@@ -192,8 +192,8 @@ bool share_info_db_init(void)
if ((vers_id == SHARE_DATABASE_VERSION_V1) || (IREV(vers_id) ==
SHARE_DATABASE_VERSION_V1)) {
/* Written on a bigendian machine with old fetch_int code. Save
as le. */
- status = dbwrap_store_int32(share_db, vstring,
- SHARE_DATABASE_VERSION_V2);
+ status = dbwrap_store_int32_bystring(
+ share_db, vstring, SHARE_DATABASE_VERSION_V2);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("dbwrap_store_int32 failed: %s\n",
nt_errstr(status)));
@@ -208,8 +208,8 @@ bool share_info_db_init(void)
DEBUG(0, ("traverse failed\n"));
goto cancel;
}
- status = dbwrap_store_int32(share_db, vstring,
- SHARE_DATABASE_VERSION_V2);
+ status = dbwrap_store_int32_bystring(
+ share_db, vstring, SHARE_DATABASE_VERSION_V2);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("dbwrap_store_int32 failed: %s\n",
nt_errstr(status)));
@@ -224,8 +224,8 @@ bool share_info_db_init(void)
DEBUG(0, ("traverse failed\n"));
goto cancel;
}
- status = dbwrap_store_int32(share_db, vstring,
- SHARE_DATABASE_VERSION_V3);
+ status = dbwrap_store_int32_bystring(
+ share_db, vstring, SHARE_DATABASE_VERSION_V3);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("dbwrap_store_int32 failed: %s\n",
nt_errstr(status)));
diff --git a/source3/passdb/account_pol.c b/source3/passdb/account_pol.c
index 4cb185c..c94df29 100644
--- a/source3/passdb/account_pol.c
+++ b/source3/passdb/account_pol.c
@@ -233,7 +233,7 @@ bool init_account_policy(void)
}
}
- status = dbwrap_fetch_uint32(db, vstring, &version);
+ status = dbwrap_fetch_uint32_bystring(db, vstring, &version);
if (!NT_STATUS_IS_OK(status)) {
version = 0;
}
@@ -250,7 +250,7 @@ bool init_account_policy(void)
return false;
}
- status = dbwrap_fetch_uint32(db, vstring, &version);
+ status = dbwrap_fetch_uint32_bystring(db, vstring, &version);
if (!NT_STATUS_IS_OK(status)) {
version = 0;
}
@@ -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)));
@@ -340,7 +341,7 @@ bool account_policy_get(enum pdb_policy_type type, uint32_t
*value)
return False;
}
- status = dbwrap_fetch_uint32(db, name, ®val);
+ status = dbwrap_fetch_uint32_bystring(db, name, ®val);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("account_policy_get: tdb_fetch_uint32 failed for type
%d (%s), returning 0\n", type, name));
return False;
@@ -374,7 +375,7 @@ bool account_policy_set(enum pdb_policy_type type, uint32_t
value)
return False;
}
- status = dbwrap_trans_store_uint32(db, name, value);
+ status = dbwrap_trans_store_uint32_bystring(db, name, value);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(1, ("store_uint32 failed for type %d (%s) on value "
"%u: %s\n", type, name, value, nt_errstr(status)));
diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
index a090fcd..8b923d6 100644
--- a/source3/passdb/pdb_tdb.c
+++ b/source3/passdb/pdb_tdb.c
@@ -329,7 +329,7 @@ static bool tdbsam_upgrade_next_rid(struct db_context *db)
bool ok = false;
NTSTATUS status;
- status = dbwrap_fetch_uint32(db, NEXT_RID_STRING, &rid);
+ status = dbwrap_fetch_uint32_bystring(db, NEXT_RID_STRING, &rid);
if (NT_STATUS_IS_OK(status)) {
return true;
}
@@ -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;
}
@@ -392,16 +392,16 @@ static bool tdbsam_convert(struct db_context **pp_db,
const char *name, int32 fr
goto cancel;
}
- status = dbwrap_store_int32(db, TDBSAM_VERSION_STRING,
- TDBSAM_VERSION);
+ status = dbwrap_store_int32_bystring(db, TDBSAM_VERSION_STRING,
+ TDBSAM_VERSION);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("tdbsam_convert: Could not store tdbsam version: "
"%s\n", nt_errstr(status)));
goto cancel;
}
- status = dbwrap_store_int32(db, TDBSAM_MINOR_VERSION_STRING,
- TDBSAM_MINOR_VERSION);
+ status = dbwrap_store_int32_bystring(db, TDBSAM_MINOR_VERSION_STRING,
+ TDBSAM_MINOR_VERSION);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("tdbsam_convert: Could not store tdbsam minor "
"version: %s\n", nt_errstr(status)));
@@ -451,14 +451,15 @@ static bool tdbsam_open( const char *name )
}
/* Check the version */
- status = dbwrap_fetch_int32(db_sam, TDBSAM_VERSION_STRING, &version);
+ status = dbwrap_fetch_int32_bystring(db_sam, TDBSAM_VERSION_STRING,
+ &version);
if (!NT_STATUS_IS_OK(status)) {
version = 0; /* Version not found, assume version 0 */
}
/* Get the minor version */
- status = dbwrap_fetch_int32(db_sam, TDBSAM_MINOR_VERSION_STRING,
- &minor_version);
+ status = dbwrap_fetch_int32_bystring(
+ db_sam, TDBSAM_MINOR_VERSION_STRING, &minor_version);
if (!NT_STATUS_IS_OK(status)) {
minor_version = 0; /* Minor version not found, assume 0 */
}
@@ -493,15 +494,15 @@ static bool tdbsam_open( const char *name )
}
/* Re-check the version */
- status = dbwrap_fetch_int32(db_sam, TDBSAM_VERSION_STRING,
- &version);
+ status = dbwrap_fetch_int32_bystring(
+ db_sam, TDBSAM_VERSION_STRING, &version);
if (!NT_STATUS_IS_OK(status)) {
version = 0; /* Version not found, assume version 0
*/
}
/* Re-check the minor version */
- status = dbwrap_fetch_int32(db_sam, TDBSAM_MINOR_VERSION_STRING,
- &minor_version);
+ status = dbwrap_fetch_int32_bystring(
+ db_sam, TDBSAM_MINOR_VERSION_STRING, &minor_version);
if (!NT_STATUS_IS_OK(status)) {
minor_version = 0; /* Minor version not found, assume 0
*/
}
@@ -1117,8 +1118,8 @@ static bool tdbsam_new_rid(struct pdb_methods *methods,
uint32 *prid)
return false;
}
- status = dbwrap_trans_change_uint32_atomic(db_sam, NEXT_RID_STRING,
- &rid, 1);
+ status = dbwrap_trans_change_uint32_atomic_bystring(
+ db_sam, NEXT_RID_STRING, &rid, 1);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(3, ("tdbsam_new_rid: Failed to increase %s: %s\n",
NEXT_RID_STRING, nt_errstr(status)));
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 33a266c..83d3e72 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -49,8 +49,8 @@ static void get_rand_seed(void *userdata, int *new_seed)
{
*new_seed = getpid();
if (db_ctx) {
- dbwrap_trans_change_int32_atomic(db_ctx, "INFO/random_seed",
- new_seed, 1);
+ dbwrap_trans_change_int32_atomic_bystring(
+ db_ctx, "INFO/random_seed", new_seed, 1);
}
}
diff --git a/source3/registry/reg_backend_db.c
b/source3/registry/reg_backend_db.c
index a5bb5d7..8fe1b8e 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -72,7 +72,8 @@ static NTSTATUS regdb_trans_do_action(struct db_context *db,
void *private_data)
int32_t version_id;
struct regdb_trans_ctx *ctx = (struct regdb_trans_ctx *)private_data;
- status = dbwrap_fetch_int32(db, REGDB_VERSION_KEYNAME, &version_id);
+ status = dbwrap_fetch_int32_bystring(db, REGDB_VERSION_KEYNAME,
+ &version_id);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0, ("ERROR: could not fetch registry db version: %s. "
@@ -484,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)));
@@ -754,7 +756,8 @@ WERROR regdb_init(void)
DEBUG(10, ("regdb_init: registry db openend. refcount reset (%d)\n",
regdb_refcount));
- status = dbwrap_fetch_int32(regdb, REGDB_VERSION_KEYNAME, &vers_id);
+ status = dbwrap_fetch_int32_bystring(regdb, REGDB_VERSION_KEYNAME,
+ &vers_id);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("regdb_init: registry version uninitialized "
"(got %d), initializing to version %d\n",
diff --git a/source3/torture/test_dbwrap_watch.c
b/source3/torture/test_dbwrap_watch.c
index 8011c57..2a21617 100644
--- a/source3/torture/test_dbwrap_watch.c
+++ b/source3/torture/test_dbwrap_watch.c
@@ -66,7 +66,7 @@ bool run_dbwrap_watch1(int dummy)
}
TALLOC_FREE(rec);
- status = dbwrap_store_int32(db, keystr, 1);
+ status = dbwrap_store_int32_bystring(db, keystr, 1);
if (!NT_STATUS_IS_OK(status)) {
fprintf(stderr, "dbwrap_store_int32 failed: %s\n",
nt_errstr(status));
diff --git a/source3/torture/test_idmap_tdb_common.c
b/source3/torture/test_idmap_tdb_common.c
index 7e7c5dd..d081660 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/torture/torture.c b/source3/torture/torture.c
index 5fa6330..a9edd61 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -8656,7 +8656,7 @@ static bool run_local_dbtrans(int dummy)
break;
}
- status = dbwrap_fetch_uint32(db, "transtest", &val);
+ status = dbwrap_fetch_uint32_bystring(db, "transtest", &val);
if (!NT_STATUS_IS_OK(status)) {
printf(__location__ "dbwrap_fetch_uint32 failed: %s\n",
nt_errstr(status));
@@ -8669,7 +8669,7 @@ static bool run_local_dbtrans(int dummy)
}
}
- status = dbwrap_fetch_uint32(db, "transtest", &val2);
+ status = dbwrap_fetch_uint32_bystring(db, "transtest", &val2);
if (!NT_STATUS_IS_OK(status)) {
printf(__location__ "dbwrap_fetch_uint32 failed: %s\n",
nt_errstr(status));
--
Samba Shared Repository
