diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-03-07 23:02:36 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-03-07 23:02:36 +0100 |
| commit | 87abb775ce9a7610341ff8f06d1c482e72e6fd6d (patch) | |
| tree | 6d74ffa4dbc967cd0f05a7182ca78f78d54dafdb /source4/ntvfs/cifs/vfs_cifs.c | |
| parent | 6a1f56d82a367a2f037e18ed346cf7cce7f377e0 (diff) | |
| parent | db669e1eb13effb08b1111405587c8c6dde95954 (diff) | |
| download | samba-87abb775ce9a7610341ff8f06d1c482e72e6fd6d.tar.gz samba-87abb775ce9a7610341ff8f06d1c482e72e6fd6d.tar.bz2 samba-87abb775ce9a7610341ff8f06d1c482e72e6fd6d.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit ac27a1451dfe5c0c957e93fdc84602c3c1c7deac)
Diffstat (limited to 'source4/ntvfs/cifs/vfs_cifs.c')
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 901dd2cf7c..58183b5e60 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -207,7 +207,11 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, io.in.service = remote_share; io.in.service_type = "?????"; lp_smbcli_options(ntvfs->ctx->lp_ctx, &io.in.options); - + + if (!(ntvfs->ctx->client_caps & NTVFS_CLIENT_CAP_LEVEL_II_OPLOCKS)) { + io.in.options.use_level2_oplocks = false; + } + creq = smb_composite_connect_send(&io, private, lp_resolve_context(ntvfs->ctx->lp_ctx), ntvfs->ctx->event_ctx); |