tdb_wrap: Remove tdb_wrap_open_ again

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

7 files changed, 18 insertions, 18 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/partition_metadata.c b/source4/dsdb/samdb/ldb_modules/partition_metadata.c
index 8441b13d472..1db800ec6af 100644
--- a/source4/dsdb/samdb/ldb_modules/partition_metadata.c
+++ b/source4/dsdb/samdb/ldb_modules/partition_metadata.c
@@ -240,7 +240,7 @@ static int partition_metadata_open(struct ldb_module *module, bool create)
 	lp_ctx = talloc_get_type_abort(ldb_get_opaque(ldb, "loadparm"),
 				       struct loadparm_context);
 
-	data->metadata->db = tdb_wrap_open_(
+	data->metadata->db = tdb_wrap_open(
 		data->metadata, filename, 10,
 		lpcfg_tdb_flags(lp_ctx, TDB_DEFAULT), open_flags, 0660);
 	if (data->metadata->db == NULL) {
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index 2e9eb5cad6e..25a780150a8 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -90,9 +90,9 @@ static int schema_metadata_open(struct ldb_module *module)
 	lp_ctx = talloc_get_type_abort(ldb_get_opaque(ldb, "loadparm"),
 				       struct loadparm_context);
 
-	data->metadata = tdb_wrap_open_(data, filename, 10,
-					lpcfg_tdb_flags(lp_ctx, TDB_DEFAULT),
-					open_flags, 0660);
+	data->metadata = tdb_wrap_open(data, filename, 10,
+				       lpcfg_tdb_flags(lp_ctx, TDB_DEFAULT),
+				       open_flags, 0660);
 	if (data->metadata == NULL) {
 		talloc_free(tmp_ctx);
 		return LDB_ERR_OPERATIONS_ERROR;
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index e182acd83c3..ba1c5bd727c 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -899,10 +899,10 @@ static struct tdb_wrap *irpc_namedb_open(struct imessaging_context *msg_ctx)
 	if (path == NULL) {
 		return NULL;
 	}
-	t = tdb_wrap_open_(msg_ctx, path,
-			   lpcfg_tdb_hash_size(msg_ctx->lp_ctx, path),
-			   lpcfg_tdb_flags(msg_ctx->lp_ctx, 0),
-			   O_RDWR|O_CREAT, 0660);
+	t = tdb_wrap_open(msg_ctx, path,
+			  lpcfg_tdb_hash_size(msg_ctx->lp_ctx, path),
+			  lpcfg_tdb_flags(msg_ctx->lp_ctx, 0),
+			  O_RDWR|O_CREAT, 0660);
 	talloc_free(path);
 	return t;
 }
diff --git a/source4/ntvfs/posix/python/pyposix_eadb.c b/source4/ntvfs/posix/python/pyposix_eadb.c
index c04d329f141..9db0ddb770b 100644
--- a/source4/ntvfs/posix/python/pyposix_eadb.c
+++ b/source4/ntvfs/posix/python/pyposix_eadb.c
@@ -50,7 +50,7 @@ static PyObject *py_wrap_setxattr(PyObject *self, PyObject *args)
 
 	blob.length = blobsize;
 	mem_ctx = talloc_new(NULL);
-	eadb = tdb_wrap_open_(
+	eadb = tdb_wrap_open(
 		mem_ctx, tdbname, 50000,
 		lpcfg_tdb_flags(py_default_loadparm_context(mem_ctx),
 				TDB_DEFAULT),
@@ -85,7 +85,7 @@ static PyObject *py_wrap_getxattr(PyObject *self, PyObject *args)
 		return NULL;
 
 	mem_ctx = talloc_new(NULL);
-	eadb = tdb_wrap_open_(
+	eadb = tdb_wrap_open(
 		mem_ctx, tdbname, 50000,
 		lpcfg_tdb_flags(py_default_loadparm_context(mem_ctx),
 				TDB_DEFAULT),
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index a9ba44f20bf..304a9ff8fe5 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -120,7 +120,7 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
 	/* allow xattrs to be stored in a external tdb */
 	eadb = share_string_option(pvfs, scfg, PVFS_EADB, NULL);
 	if (eadb != NULL) {
-		pvfs->ea_db = tdb_wrap_open_(
+		pvfs->ea_db = tdb_wrap_open(
 			pvfs, eadb, 50000,
 			lpcfg_tdb_flags(pvfs->ntvfs->ctx->lp_ctx, TDB_DEFAULT),
 			O_RDWR|O_CREAT, 0600);
diff --git a/source4/param/secrets.c b/source4/param/secrets.c
index e27524e231b..92e338a6bab 100644
--- a/source4/param/secrets.c
+++ b/source4/param/secrets.c
@@ -59,10 +59,10 @@ bool randseed_init(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
 
 	fname = lpcfg_private_path(mem_ctx, lp_ctx, "randseed.tdb");
 
-	tdb = tdb_wrap_open_(mem_ctx, fname,
-			     lpcfg_tdb_hash_size(lp_ctx, fname),
-			     lpcfg_tdb_flags(lp_ctx, TDB_DEFAULT),
-			     O_RDWR|O_CREAT, 0600);
+	tdb = tdb_wrap_open(mem_ctx, fname,
+			    lpcfg_tdb_hash_size(lp_ctx, fname),
+			    lpcfg_tdb_flags(lp_ctx, TDB_DEFAULT),
+			    O_RDWR|O_CREAT, 0600);
 
 	if (!tdb) {
 		DEBUG(0,("Failed to open %s\n", fname));
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 27d1e0ce15e..185faecd963 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -64,9 +64,9 @@ static bool test_tdb_speed(struct torture_context *torture, const void *_data)
 
 	torture_comment(torture, "Testing tdb speed for sidmap\n");
 
-	tdbw = tdb_wrap_open_(tmp_ctx, "test.tdb", 10000,
-			      lpcfg_tdb_flags(torture->lp_ctx, 0),
-			      O_RDWR|O_CREAT|O_TRUNC, 0600);
+	tdbw = tdb_wrap_open(tmp_ctx, "test.tdb", 10000,
+			     lpcfg_tdb_flags(torture->lp_ctx, 0),
+			     O_RDWR|O_CREAT|O_TRUNC, 0600);
 	if (!tdbw) {
 		torture_result(torture, TORTURE_FAIL, "Failed to open test.tdb");
 		goto failed;