summaryrefslogtreecommitdiff
path: root/source4/cluster
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-28 00:59:54 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-28 00:59:54 +0100
commit90f76ae99b537c24e8e26fead1d8b857afa0a7a6 (patch)
tree8f93070e2e20d7dc5345740bf59dacdd65e784c5 /source4/cluster
parent18d80bdf1fc5a281358aef29324230698eb434d4 (diff)
parent4eb694389c88dd33f5ebea78c11ca1cb108357d2 (diff)
downloadsamba-90f76ae99b537c24e8e26fead1d8b857afa0a7a6.tar.gz
samba-90f76ae99b537c24e8e26fead1d8b857afa0a7a6.tar.bz2
samba-90f76ae99b537c24e8e26fead1d8b857afa0a7a6.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4e0b94d648e955b950c50d2ac19e17b06ee1f818)
Diffstat (limited to 'source4/cluster')
-rw-r--r--source4/cluster/ctdb/opendb_ctdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/cluster/ctdb/opendb_ctdb.c b/source4/cluster/ctdb/opendb_ctdb.c
index 402f3a2a1a..ed09cf0bbc 100644
--- a/source4/cluster/ctdb/opendb_ctdb.c
+++ b/source4/cluster/ctdb/opendb_ctdb.c
@@ -97,7 +97,7 @@ static struct odb_context *odb_ctdb_init(TALLOC_CTX *mem_ctx,
odb->ntvfs_ctx = ntvfs_ctx;
/* leave oplocks disabled by default until the code is working */
- odb->oplocks = lp_parm_bool(ntvfs_ctx->lp_ctx, NULL, "opendb", "oplocks", false);
+ odb->oplocks = share_bool_option(ntvfs_ctx->config, SHARE_OPLOCKS, SHARE_OPLOCKS_DEFAULT);
return odb;
}