From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 19 Jun 2017 08:00:32 +0000 (+0200)
Subject: s3:torture: use CLI_FULL_CONNECTION_DISABLE_SMB1 in run_oplock_cancel()
X-Git-Tag: tevent-0.9.32~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade99269689b6c6b7fc0e9f5e603b393cc00de1f;p=thirdparty%2Fsamba.git

s3:torture: use CLI_FULL_CONNECTION_DISABLE_SMB1 in run_oplock_cancel()

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/torture/test_oplock_cancel.c b/source3/torture/test_oplock_cancel.c
index aa4218a1126..d856650fa23 100644
--- a/source3/torture/test_oplock_cancel.c
+++ b/source3/torture/test_oplock_cancel.c
@@ -113,15 +113,22 @@ bool run_oplock_cancel(int dummy)
 	const char *fname = "oplock-cancel";
 	uint16_t fnum1;
 	NTSTATUS status;
+	/*
+	 * Currently this test seems to work only
+	 * with SMB2/3 and only against Samba.
+	 *
+	 * TODO: we should change our server
+	 * to ignore cancel for SMB2 Create
+	 * and behave like Windows.
+	 */
+	int flags = CLI_FULL_CONNECTION_DISABLE_SMB1;
 
-	lp_set_cmdline("client max protocol", "smb3");
-
-	if (!torture_open_connection(&cli1, 0)) {
+	if (!torture_open_connection_flags(&cli1, 0, flags)) {
 		return false;
 	}
 	cli1->use_oplocks = true;
 
-	if (!torture_open_connection(&cli2, 0)) {
+	if (!torture_open_connection_flags(&cli2, 0, flags)) {
 		return false;
 	}
 	cli2->use_oplocks = true;