summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-06 15:11:16 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-06 16:31:25 +0100
commit3cbe47b2aef427f7f1fe8f4aa2496fbbe31a3ade (patch)
tree74a54f9d74298c8f6e025e186933805fae1ffbdf /source4/torture
parentc24329dc0710df7520e77d67e5d9bc43f59fd24f (diff)
downloadsamba-3cbe47b2aef427f7f1fe8f4aa2496fbbe31a3ade.tar.gz
samba-3cbe47b2aef427f7f1fe8f4aa2496fbbe31a3ade.tar.bz2
samba-3cbe47b2aef427f7f1fe8f4aa2496fbbe31a3ade.zip
libcli/raw: make it possible to not send CAP_LEVEL_II_OPLOCKS
But the keep the default to always send it when the server supports it too. metze (This used to be commit 33caaef2e46557525a8ffb79d6dd0db46a079529)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/util_smb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c
index ddf7b85c63..ba62f3789c 100644
--- a/source4/torture/util_smb.c
+++ b/source4/torture/util_smb.c
@@ -478,6 +478,9 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
lp_smbcli_options(tctx->lp_ctx, &options);
+ options.use_oplocks = torture_setting_bool(tctx, "use_oplocks", true);
+ options.use_level2_oplocks = torture_setting_bool(tctx, "use_level2_oplocks", true);
+
status = smbcli_full_connection(mem_ctx, c, hostname,
lp_smb_ports(tctx->lp_ctx),
sharename, NULL,
@@ -489,9 +492,6 @@ _PUBLIC_ bool torture_open_connection_share(TALLOC_CTX *mem_ctx,
return false;
}
- (*c)->transport->options.use_oplocks = torture_setting_bool(tctx, "use_oplocks", false);
- (*c)->transport->options.use_level2_oplocks = torture_setting_bool(tctx, "use_level2_oplocks", false);
-
return true;
}