diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 00:59:54 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-28 00:59:54 +0100 |
| commit | 90f76ae99b537c24e8e26fead1d8b857afa0a7a6 (patch) | |
| tree | 8f93070e2e20d7dc5345740bf59dacdd65e784c5 /source4/ntvfs | |
| parent | 18d80bdf1fc5a281358aef29324230698eb434d4 (diff) | |
| parent | 4eb694389c88dd33f5ebea78c11ca1cb108357d2 (diff) | |
| download | samba-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/ntvfs')
| -rw-r--r-- | source4/ntvfs/common/opendb_tdb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c index fc05b342a8..99c0a95c20 100644 --- a/source4/ntvfs/common/opendb_tdb.c +++ b/source4/ntvfs/common/opendb_tdb.c @@ -101,8 +101,7 @@ static struct odb_context *odb_tdb_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", true); + odb->oplocks = share_bool_option(ntvfs_ctx->config, SHARE_OPLOCKS, SHARE_OPLOCKS_DEFAULT); odb->lease_ctx = sys_lease_context_create(ntvfs_ctx->config, odb, ntvfs_ctx->event_ctx, |