summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-07 19:12:14 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-07 19:15:19 +0100
commitb655468cf6646bdcc6bb78fe87492cf34b54713f (patch)
treeeb5d1e6d446ba9124d53938bb208533240091b7d /source4/ntvfs
parenta72e921a7ea216d6467ac8b75b4265b4689833ef (diff)
downloadsamba-b655468cf6646bdcc6bb78fe87492cf34b54713f.tar.gz
samba-b655468cf6646bdcc6bb78fe87492cf34b54713f.tar.bz2
samba-b655468cf6646bdcc6bb78fe87492cf34b54713f.zip
vfs_cifs: disable level2 oplocks if the frontend client doesn't support them
metze (This used to be commit a63910e8e5c075aff45b8eb0d246d2823f09bb9c)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c6
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);