diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-27 21:00:04 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-27 21:00:04 +1100 |
| commit | d554590d336cd49e08b518811934d5fa61a47fd5 (patch) | |
| tree | 855595414f47fd4c121b1212a154996b5f832eae /source4 | |
| parent | 91ae032c53d9a121a241a9886a1f873db81d7d88 (diff) | |
| download | samba-d554590d336cd49e08b518811934d5fa61a47fd5.tar.gz samba-d554590d336cd49e08b518811934d5fa61a47fd5.tar.bz2 samba-d554590d336cd49e08b518811934d5fa61a47fd5.zip | |
Fix how we initialise the oplocks parameter.
Andrew Bartlett
(This used to be commit 08ec91958d5d773dfc805869685094da749470e8)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/param/loadparm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 9e0a239abe..94f4033352 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2252,6 +2252,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lp_ctx->sDefault->bRead_only = true; lp_ctx->sDefault->bMap_archive = true; lp_ctx->sDefault->bStrictLocking = true; + lp_ctx->sDefault->bOplocks = true; lp_ctx->sDefault->iCreate_mask = 0744; lp_ctx->sDefault->iCreate_force_mode = 0000; lp_ctx->sDefault->iDir_mask = 0755; @@ -2408,8 +2409,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) lp_do_global_parameter(lp_ctx, "prefork children:smb", "4"); - lp_do_global_parameter(lp_ctx, "oplocks", "true"); - for (i = 0; parm_table[i].label; i++) { if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) { lp_ctx->flags[i] |= FLAG_DEFAULT; |