From: Ralph Boehme <slow@samba.org>
Date: Sat, 4 Aug 2018 14:40:14 +0000 (+0200)
Subject: smbtorture: correctly handle scale-out shares in smb2.durable-v2-open.[persistent... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0fb7db8ff37ec58f93356edabc9a69d3ebc4790;p=thirdparty%2Fsamba.git

smbtorture: correctly handle scale-out shares in smb2.durable-v2-open.[persistent-]open-oplock

This ensures the tests work correctly against Windows on cluster shares with and
without SMB2_SHARE_CAP_SCALEOUT.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source4/torture/smb2/durable_v2_open.c b/source4/torture/smb2/durable_v2_open.c
index ed0b32237b1..698778ba287 100644
--- a/source4/torture/smb2/durable_v2_open.c
+++ b/source4/torture/smb2/durable_v2_open.c
@@ -287,13 +287,44 @@ static bool test_one_durable_v2_open_oplock(struct torture_context *tctx,
 {
 	NTSTATUS status;
 	TALLOC_CTX *mem_ctx = talloc_new(tctx);
+	uint32_t share_capabilities;
+	bool share_is_so;
 	struct smb2_handle _h;
 	struct smb2_handle *h = NULL;
 	bool ret = true;
 	struct smb2_create io;
+	uint8_t expected_oplock_level;
+	bool expected_durable;
 
 	smb2_util_unlink(tree, fname);
 
+	share_capabilities = smb2cli_tcon_capabilities(tree->smbXcli);
+	share_is_so = share_capabilities & SMB2_SHARE_CAP_SCALEOUT;
+
+	expected_oplock_level = smb2_util_oplock_level(test.level);
+	expected_durable = test.durable;
+
+	if (share_is_so) {
+		/*
+		 * MS-SMB2 3.3.5.9 Receiving an SMB2 CREATE Request
+		 *
+		 * If Connection.Dialect belongs to the SMB 3.x dialect family,
+		 * TreeConnect.Share.Type is STYPE_CLUSTER_SOFS as specified in
+		 * [MS-SRVS] section 2.2.2.4, and the RequestedOplockLevel is
+		 * SMB2_OPLOCK_LEVEL_BATCH, the server MUST set
+		 * RequestedOplockLevel to SMB2_OPLOCK_LEVEL_II.
+		 */
+		if (expected_oplock_level == SMB2_OPLOCK_LEVEL_BATCH) {
+			expected_oplock_level = SMB2_OPLOCK_LEVEL_II;
+		}
+		/*
+		 * No Durable Handles on SOFS shares, only Persistent Handles.
+		 */
+		if (!request_persistent) {
+			expected_durable = false;
+		}
+	}
+
 	smb2_oplock_create_share(&io, fname,
 				 smb2_util_share_access(test.share_mode),
 				 smb2_util_oplock_level(test.level));
@@ -308,9 +339,9 @@ static bool test_one_durable_v2_open_oplock(struct torture_context *tctx,
 	h = &_h;
 	CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
 	CHECK_VAL(io.out.durable_open, false);
-	CHECK_VAL(io.out.durable_open_v2, test.durable);
+	CHECK_VAL(io.out.durable_open_v2, expected_durable);
 	CHECK_VAL(io.out.persistent_open, test.persistent);
-	CHECK_VAL(io.out.oplock_level, smb2_util_oplock_level(test.level));
+	CHECK_VAL(io.out.oplock_level, expected_oplock_level);
 
 done:
 	if (h != NULL) {