From 66156220ebf5dc212e9aa86015b7301d1b665b50 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 5 Apr 2007 03:51:49 +0000
Subject: r22082: merged the ctdb changes from bzr

added opendb ctdb backend from ronnie
(This used to be commit b0da25cb79f860bfa14ba7a8419c7996d936292b)
---
 source4/ntvfs/common/config.mk | 2 +-
 source4/ntvfs/common/opendb.c  | 6 +++++-
 source4/ntvfs/common/opendb.h  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'source4/ntvfs/common')

diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk
index 665e8e255b..5c744f9c90 100644
--- a/source4/ntvfs/common/config.mk
+++ b/source4/ntvfs/common/config.mk
@@ -10,6 +10,6 @@ OBJ_FILES = \
 		opendb_tdb.o \
 		notify.o
 PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify share
-PRIVATE_DEPENDENCIES = brlock_ctdb
+PRIVATE_DEPENDENCIES = brlock_ctdb opendb_ctdb
 # End LIBRARY ntvfs_common
 ################################################
diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c
index c17b819c04..ea27efdf3b 100644
--- a/source4/ntvfs/common/opendb.c
+++ b/source4/ntvfs/common/opendb.c
@@ -62,7 +62,11 @@ _PUBLIC_ struct odb_context *odb_init(TALLOC_CTX *mem_ctx,
 				      struct ntvfs_context *ntvfs_ctx)
 {
 	if (ops == NULL) {
-		odb_tdb_init_ops();
+		if (lp_parm_bool(-1, "ctdb", "opendb", False)) {
+			odb_ctdb_init_ops();
+		} else {
+			odb_tdb_init_ops();
+		}
 	}
 	return ops->odb_init(mem_ctx, ntvfs_ctx);
 }
diff --git a/source4/ntvfs/common/opendb.h b/source4/ntvfs/common/opendb.h
index 9d6c18c471..85bb678d77 100644
--- a/source4/ntvfs/common/opendb.h
+++ b/source4/ntvfs/common/opendb.h
@@ -46,4 +46,4 @@ struct opendb_ops {
 
 void odb_set_ops(const struct opendb_ops *new_ops);
 void odb_tdb_init_ops(void);
-
+void odb_ctdb_init_ops(void);
-- 
cgit