From: Ralph Boehme <slow@samba.org>
Date: Wed, 11 Apr 2018 15:07:54 +0000 (+0200)
Subject: dbwrap: convert dbwrap_trans_store_bystring() from TDB to DBWRAP flags
X-Git-Tag: talloc-2.5.0~240
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8356f1f59c57be00a126a974f3cd56ce166052ce;p=thirdparty%2Fsamba.git

dbwrap: convert dbwrap_trans_store_bystring() from TDB to DBWRAP flags

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/source3/registry/reg_backend_db.c b/source3/registry/reg_backend_db.c
index fff041bd5b8..bf805f170e5 100644
--- a/source3/registry/reg_backend_db.c
+++ b/source3/registry/reg_backend_db.c
@@ -2083,7 +2083,7 @@ static NTSTATUS regdb_store_values_internal(struct db_context *db,
 		goto done;
 	}
 
-	status = dbwrap_trans_store_bystring(db, keystr, data, TDB_REPLACE);
+	status = dbwrap_trans_store_bystring(db, keystr, data, DBWRAP_REPLACE);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0, ("regdb_store_values_internal: error storing: %s\n", nt_errstr(status)));
 		goto done;
diff --git a/source3/utils/dbwrap_tool.c b/source3/utils/dbwrap_tool.c
index d9537a788e2..66380a98b5c 100644
--- a/source3/utils/dbwrap_tool.c
+++ b/source3/utils/dbwrap_tool.c
@@ -185,7 +185,7 @@ static int dbwrap_tool_store_string(struct db_context *db,
 	if (dbwrap_is_persistent(db)) {
 		status = dbwrap_trans_store_bystring(db, keyname,
 						     tdbdata,
-						     TDB_REPLACE);
+						     DBWRAP_REPLACE);
 	} else {
 		status = dbwrap_store_bystring(db, keyname,
 					      tdbdata,
@@ -225,7 +225,7 @@ static int dbwrap_tool_store_hex(struct db_context *db,
 	if (dbwrap_is_persistent(db)) {
 		status = dbwrap_trans_store_bystring(db, keyname,
 						     tdbdata,
-						     TDB_REPLACE);
+						     DBWRAP_REPLACE);
 	} else {
 		status = dbwrap_store_bystring(db, keyname,
 					       tdbdata,
diff --git a/source3/winbindd/idmap_autorid_tdb.c b/source3/winbindd/idmap_autorid_tdb.c
index 461dabaecec..fdbfe112b5b 100644
--- a/source3/winbindd/idmap_autorid_tdb.c
+++ b/source3/winbindd/idmap_autorid_tdb.c
@@ -973,7 +973,10 @@ NTSTATUS idmap_autorid_saveconfig(struct db_context *db,
 
 	data = string_tdb_data(cfgstr);
 
-	status = dbwrap_trans_store_bystring(db, CONFIGKEY, data, TDB_REPLACE);
+	status = dbwrap_trans_store_bystring(db,
+					     CONFIGKEY,
+					     data,
+					     DBWRAP_REPLACE);
 
 done:
 	TALLOC_FREE(frame);