source4/cluster and source4/ntvfs: convert to dbwrap, add ntdb option.

[obnox/samba/samba-obnox.git] / source4 / cluster / cluster.c

diff --git a/source4/cluster/cluster.c b/source4/cluster/cluster.c
index 9dcec2e3e07d7b287704952e93b451b548456283..11c4194d9a34dc193fe6c3087099059648ff69cf 100644 (file)
--- a/source4/cluster/cluster.c
+++ b/source4/cluster/cluster.c
@@ -23,7 +23,7 @@
 #include "cluster/cluster.h"
 #include "cluster/cluster_private.h"
 #include "librpc/gen_ndr/misc.h"
-#include "librpc/gen_ndr/server_id4.h"
+#include "librpc/gen_ndr/server_id.h"
 
 static struct cluster_ops *ops;
 
@@ -56,24 +56,13 @@ struct server_id cluster_id(uint64_t pid, uint32_t task_id)
        return ops->cluster_id(ops, pid, task_id);
 }
 
-
-/*
-  return a server_id as a string
-*/
-char *cluster_id_string(TALLOC_CTX *mem_ctx, struct server_id id)
-{
-       cluster_init();
-       return ops->cluster_id_string(ops, mem_ctx, id);
-}
-
-
 /*
   open a temporary tdb in a cluster friendly manner
 */
-struct tdb_wrap *cluster_tdb_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbname, int flags)
+struct db_context *cluster_db_tmp_open(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, const char *dbbase, int flags)
 {
        cluster_init();
-       return ops->cluster_tdb_tmp_open(ops, mem_ctx, lp_ctx, dbname, flags);
+       return ops->cluster_db_tmp_open(ops, mem_ctx, lp_ctx, dbbase, flags);
 }