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

dbwrap: convert dbwrap_trans_store() from TDB to DBWRAP flags

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

diff --git a/lib/dbwrap/dbwrap_util.c b/lib/dbwrap/dbwrap_util.c
index 6ae5a0541a6..88ca144a973 100644
--- a/lib/dbwrap/dbwrap_util.c
+++ b/lib/dbwrap/dbwrap_util.c
@@ -425,7 +425,7 @@ NTSTATUS dbwrap_trans_store_int32_bystring(struct db_context *db,
 	return dbwrap_trans_store(db, string_term_tdb_data(keystr),
 				  make_tdb_data((const uint8_t *)&v_store,
 						sizeof(v_store)),
-				  TDB_REPLACE);
+				  DBWRAP_REPLACE);
 }
 
 NTSTATUS dbwrap_trans_store_uint32_bystring(struct db_context *db,
@@ -439,7 +439,7 @@ NTSTATUS dbwrap_trans_store_uint32_bystring(struct db_context *db,
 	return dbwrap_trans_store(db, string_term_tdb_data(keystr),
 				  make_tdb_data((const uint8_t *)&v_store,
 						sizeof(v_store)),
-				  TDB_REPLACE);
+				  DBWRAP_REPLACE);
 }
 
 NTSTATUS dbwrap_trans_store_bystring(struct db_context *db, const char *key,
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 2ebac7cd654..dca83b26878 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -166,7 +166,7 @@ static bool add_mapping_entry(GROUP_MAP *map, int flag)
 
 	status = dbwrap_trans_store(
 		db, string_term_tdb_data(key),
-		make_tdb_data((uint8_t *)buf, len), TDB_REPLACE);
+		make_tdb_data((uint8_t *)buf, len), DBWRAP_REPLACE);
 
 	TALLOC_FREE(key);
 
diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c
index 913d0e5c84b..1a3bb3a47a9 100644
--- a/source3/lib/sharesec.c
+++ b/source3/lib/sharesec.c
@@ -395,7 +395,7 @@ NTSTATUS set_share_security(const char *share_name,
 	}
 
 	status = dbwrap_trans_store(share_db, string_term_tdb_data(key), blob,
-				    TDB_REPLACE);
+				    DBWRAP_REPLACE);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(1, ("set_share_security: Failed to store secdesc for "
 			  "%s: %s\n", share_name, nt_errstr(status)));
diff --git a/source3/passdb/secrets.c b/source3/passdb/secrets.c
index 6bbc21a3b38..d599675f13f 100644
--- a/source3/passdb/secrets.c
+++ b/source3/passdb/secrets.c
@@ -150,7 +150,7 @@ bool secrets_store(const char *key, const void *data, size_t size)
 
 	status = dbwrap_trans_store(db_ctx, string_tdb_data(key),
 				    make_tdb_data((const uint8_t *)data, size),
-				    TDB_REPLACE);
+				    DBWRAP_REPLACE);
 	return NT_STATUS_IS_OK(status);
 }