Changeset 752 for trunk/server/source4/torture/smb2

Timestamp:

Nov 29, 2012, 2:06:31 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9 2nd part

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/torture/smb2/compound.c (modified) (10 diffs)
• source4/torture/smb2/connect.c (modified) (1 diff)
• source4/torture/smb2/oplock.c (modified) (2 diffs)
• source4/torture/smb2/read.c (modified) (2 diffs)

trunk/server/source4/torture/smb2/compound.c

@@ -33 +33 @@
                 goto done; \
         }} while (0)
-
-#define TARGET_IS_W2K8(_tctx) (torture_setting_bool(_tctx, "w2k8", false))
-#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
 
 static bool test_compound_related1(struct torture_context *tctx,
@@ -167 +164 @@
         CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[3], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[4], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
         tree->tid = saved_tid;
@@ -253 +250 @@
         struct smb2_close cl;
         bool ret = true;
-        struct smb2_request *req[2];
-
-        smb2_transport_credits_ask_num(tree->session->transport, 2);
+        struct smb2_request *req[3];
+
+        smb2_transport_credits_ask_num(tree->session->transport, 3);
 
         smb2_util_unlink(tree, fname);
@@ -279 +276 @@
         cr.in.fname                     = fname;
 
-        smb2_transport_compound_start(tree->session->transport, 2);
+        smb2_transport_compound_start(tree->session->transport, 3);
 
         /* passing the first request with the related flag is invalid */
@@ -292 +289 @@
         cl.in.file.handle = hd;
         req[1] = smb2_close_send(tree, &cl);
+
+        smb2_transport_compound_set_related(tree->session->transport, false);
+        req[2] = smb2_close_send(tree, &cl);
 
         status = smb2_create_recv(req[0], tree, &cr);
@@ -298 +298 @@
         status = smb2_close_recv(req[1], &cl);
         CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        status = smb2_close_recv(req[2], &cl);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
         smb2_util_unlink(tree, fname);
@@ -368 +370 @@
         CHECK_STATUS(status, NT_STATUS_OK);
         status = smb2_close_recv(req[2], &cl);
-        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
+        CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
         status = smb2_close_recv(req[3], &cl);
-        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
+        CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
         status = smb2_close_recv(req[4], &cl);
         CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
@@ -440 +442 @@
         CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[3], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
         status = smb2_close_recv(req[4], &cl);
-        CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+        CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
         smb2_util_unlink(tree, fname);
@@ -466 +468 @@
      * SMB2 spec as noted in MS-SMB2 <159>, <162>.  This, test currently
      * verifies the Windows behavior, not the general spec behavior. */
-    if (!TARGET_IS_WIN7(tctx) && !TARGET_IS_W2K8(tctx)) {
-            torture_skip(tctx, "Interim test is specific to Windows server "
-                               "behavior.\n");
-    }
 
     smb2_transport_credits_ask_num(tree->session->transport, 5);
@@ -537 +535 @@
      * SMB2 spec as noted in MS-SMB2 <159>, <162>.  This, test currently
      * verifies the Windows behavior, not the general spec behavior. */
-    if (!TARGET_IS_WIN7(tctx) && !TARGET_IS_W2K8(tctx)) {
-            torture_skip(tctx, "Interim test is specific to Windows server "
-                               "behavior.\n");
-    }
 
     smb2_transport_credits_ask_num(tree->session->transport, 5);

trunk/server/source4/torture/smb2/connect.c

@@ -72 +72 @@
         DATA_BLOB data;
         int i;
+        uint32_t size = torture_setting_int(tctx, "smb2maxwrite", 64*1024);
         
-        if (torture_setting_bool(tctx, "dangerous", false)) {
-                data = data_blob_talloc(tree, NULL, 160000);
-        } else if (torture_setting_bool(tctx, "samba4", false)) {
-                data = data_blob_talloc(tree, NULL, UINT16_MAX);
-        } else {
-                data = data_blob_talloc(tree, NULL, torture_setting_int(tctx, "smb2maxwrite", 120000));
-        }
+        data = data_blob_talloc(tree, NULL, size);
+        if (size != data.length) {
+                printf("data_blob_talloc(%s) failed\n", size);
+                return NT_STATUS_NO_MEMORY;
+        }
+
         for (i=0;i<data.length;i++) {
                 data.data[i] = i;

trunk/server/source4/torture/smb2/oplock.c

@@ -2385 +2385 @@
         int te;
 
-        if (torture_setting_bool(tctx, "samba3", false)) {
-                torture_skip(tctx, "BATCH22 disabled against samba3\n");
-        }
-
         status = torture_smb2_testdir(tree1, BASEDIR, &h);
         torture_assert_ntstatus_ok(tctx, status, "Error creating directory");
@@ -2727 +2723 @@
                 {&fname_default_stream, true,  SMB2_OPLOCK_LEVEL_EXCLUSIVE, SMB2_OPLOCK_LEVEL_II},
         };
-
-        /* Only passes against windows at the moment. */
-        if (torture_setting_bool(tctx, "samba3", false) ||
-            torture_setting_bool(tctx, "samba4", false)) {
-                torture_skip(tctx, "STREAM1 disabled against samba3+4\n");
-        }
 
         fname_stream = talloc_asprintf(tctx, "%s:%s", fname_base, stream);

trunk/server/source4/torture/smb2/read.c

@@ -52 +52 @@
         NTSTATUS status;
         struct smb2_handle h;
-        uint8_t buf[70000];
+        uint8_t buf[64*1024];
         struct smb2_read rd;
         TALLOC_CTX *tmp_ctx = talloc_new(tree);
@@ -135 +135 @@
         NTSTATUS status;
         struct smb2_handle h;
-        uint8_t buf[70000];
+        uint8_t buf[64*1024];
         struct smb2_read rd;
         TALLOC_CTX *tmp_ctx = talloc_new(tree);