[PATCH 6/6] torture: support Windows 2k8 response for compress_invalid_buf

David Disseldorp ddiss at samba.org
Tue Aug 13 10:07:28 MDT 2013


Windows Server 2012 returns NT_STATUS_INVALID_USER_BUFFER, Windows
Server 2008r2 returns NT_STATUS_INVALID_PARAMETER. Don't fail the test
if either status is returned.

Signed-off-by: David Disseldorp <ddiss at samba.org>
---
 source4/torture/smb2/ioctl.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/source4/torture/smb2/ioctl.c b/source4/torture/smb2/ioctl.c
index bc2b4cd..75379af 100644
--- a/source4/torture/smb2/ioctl.c
+++ b/source4/torture/smb2/ioctl.c
@@ -1830,10 +1830,12 @@ static bool test_ioctl_compress_invalid_buf(struct torture_context *torture,
 	ioctl.smb2.in.flags = SMB2_IOCTL_FLAG_IS_FSCTL;
 
 	status = smb2_ioctl(tree, tmp_ctx, &ioctl.smb2);
-	/* expect Server 2k12 response status */
-	torture_assert_ntstatus_equal(torture, status,
-				      NT_STATUS_INVALID_USER_BUFFER,
-				      "invalid FSCTL_SET_COMPRESSION");
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_INVALID_USER_BUFFER)
+	 && !NT_STATUS_EQUAL(status, NT_STATUS_INVALID_PARAMETER)) {
+		/* neither Server 2k12 nor 2k8r2 response status */
+		torture_assert(torture, true,
+			       "invalid FSCTL_SET_COMPRESSION");
+	}
 
 	smb2_util_close(tree, fh);
 	talloc_free(tmp_ctx);
-- 
1.8.1.4



More information about the samba-technical mailing list