diff options
| author | Stefan Metzmacher <metze@samba.org> | 2008-12-29 11:02:32 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2008-12-29 14:46:09 +0100 |
| commit | e36d64728f79087610737fa54eee69af3ab99c5b (patch) | |
| tree | 5fee7f16373c6ca0043dd87345d845253a2c9cc5 /source4/ntvfs | |
| parent | aec16efaf29bc6c5e4973e2f4e218d7fc4b652cb (diff) | |
| download | samba-e36d64728f79087610737fa54eee69af3ab99c5b.tar.gz samba-e36d64728f79087610737fa54eee69af3ab99c5b.tar.bz2 samba-e36d64728f79087610737fa54eee69af3ab99c5b.zip | |
s4:cluster: remove old/broken ctdb code
We don't need a full copy of ctdb...
If we want to readd cluster support,
we should just use a ctdb client library.
metze
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/common/config.mk | 1 | ||||
| -rw-r--r-- | source4/ntvfs/common/opendb.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/source4/ntvfs/common/config.mk b/source4/ntvfs/common/config.mk index dff933024e..a6957ace2f 100644 --- a/source4/ntvfs/common/config.mk +++ b/source4/ntvfs/common/config.mk @@ -2,7 +2,6 @@ # Start LIBRARY ntvfs_common [SUBSYSTEM::ntvfs_common] PUBLIC_DEPENDENCIES = NDR_OPENDB NDR_NOTIFY sys_notify sys_lease share -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 6917bad52a..cfbb88f90e 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -62,11 +62,7 @@ struct odb_context *odb_init(TALLOC_CTX *mem_ctx, struct ntvfs_context *ntvfs_ctx) { if (ops == NULL) { - if (lp_parm_bool(ntvfs_ctx->lp_ctx, NULL, "ctdb", "opendb", false)) { - odb_ctdb_init_ops(); - } else { - odb_tdb_init_ops(); - } + odb_tdb_init_ops(); } return ops->odb_init(mem_ctx, ntvfs_ctx); } |