s4:torture/smb2: add smb2.durable-open.lock-oplock
[ddiss/samba.git] / source4 / torture / smb2 / durable_open.c
index d182744b3554fa2a438dc70252b3d511f38e19d8..659fa9d508da9b41ededf1323949c08157330aa0 100644 (file)
@@ -4,6 +4,7 @@
    test suite for SMB2 durable opens
 
    Copyright (C) Stefan Metzmacher 2008
+   Copyright (C) Michael Adam 2011-2012
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 #include "includes.h"
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
+#include "../libcli/smb/smbXcli_base.h"
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
+#include "../libcli/smb/smbXcli_base.h"
 
 #define CHECK_VAL(v, correct) do { \
        if ((v) != (correct)) { \
-               torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s got 0x%x - should be 0x%x\n", \
-                               __location__, #v, (int)v, (int)correct); \
+               torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s got 0x%llx - should be 0x%llx\n", \
+                               __location__, #v, (unsigned long long)v, (unsigned long long)correct); \
+               ret = false; \
+       }} while (0)
+
+#define CHECK_NOT_VAL(v, correct) do { \
+       if ((v) == (correct)) { \
+               torture_result(tctx, TORTURE_FAIL, "(%s): wrong value for %s got 0x%llx - should not be 0x%llx\n", \
+                               __location__, #v, (unsigned long long)v, (unsigned long long)correct); \
                ret = false; \
        }} while (0)
 
                goto done; \
        }} while (0)
 
-#define CHECK_CREATED(__io, __created, __attribute)                    \
-       do {                                                            \
-               CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \
-               CHECK_VAL((__io)->out.alloc_size, 0);                   \
-               CHECK_VAL((__io)->out.size, 0);                         \
-               CHECK_VAL((__io)->out.file_attr, (__attribute));        \
-               CHECK_VAL((__io)->out.reserved2, 0);                    \
-       } while(0)
+#define CHECK_CREATED(__io, __created, __attribute)                    \
+       do {                                                            \
+               CHECK_VAL((__io)->out.create_action, NTCREATEX_ACTION_ ## __created); \
+               CHECK_VAL((__io)->out.alloc_size, 0);                   \
+               CHECK_VAL((__io)->out.size, 0);                         \
+               CHECK_VAL((__io)->out.file_attr, (__attribute));        \
+               CHECK_VAL((__io)->out.reserved2, 0);                    \
+       } while(0)
+
+
+/**
+ * basic durable_open test.
+ * durable state should only be granted when requested
+ * along with a batch oplock or a handle lease.
+ *
+ * This test tests durable open with all possible oplock types.
+ */
+
+struct durable_open_vs_oplock {
+       const char *level;
+       const char *share_mode;
+       bool expected;
+};
+
+#define NUM_OPLOCK_TYPES 4
+#define NUM_SHARE_MODES 8
+#define NUM_OPLOCK_OPEN_TESTS ( NUM_OPLOCK_TYPES * NUM_SHARE_MODES )
+static struct durable_open_vs_oplock durable_open_vs_oplock_table[NUM_OPLOCK_OPEN_TESTS] =
+{
+       { "", "", false },
+       { "", "R", false },
+       { "", "W", false },
+       { "", "D", false },
+       { "", "RD", false },
+       { "", "RW", false },
+       { "", "WD", false },
+       { "", "RWD", false },
+
+       { "s", "", false },
+       { "s", "R", false },
+       { "s", "W", false },
+       { "s", "D", false },
+       { "s", "RD", false },
+       { "s", "RW", false },
+       { "s", "WD", false },
+       { "s", "RWD", false },
+
+       { "x", "", false },
+       { "x", "R", false },
+       { "x", "W", false },
+       { "x", "D", false },
+       { "x", "RD", false },
+       { "x", "RW", false },
+       { "x", "WD", false },
+       { "x", "RWD", false },
+
+       { "b", "", true },
+       { "b", "R", true },
+       { "b", "W", true },
+       { "b", "D", true },
+       { "b", "RD", true },
+       { "b", "RW", true },
+       { "b", "WD", true },
+       { "b", "RWD", true },
+};
+
+static bool test_one_durable_open_open_oplock(struct torture_context *tctx,
+                                             struct smb2_tree *tree,
+                                             const char *fname,
+                                             struct durable_open_vs_oplock test)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       bool ret = true;
+       struct smb2_create io;
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io, fname,
+                                smb2_util_share_access(test.share_mode),
+                                smb2_util_oplock_level(test.level));
+       io.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io.out.durable_open, test.expected);
+       CHECK_VAL(io.out.oplock_level, smb2_util_oplock_level(test.level));
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree, *h);
+       }
+       smb2_util_unlink(tree, fname);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+bool test_durable_open_open_oplock(struct torture_context *tctx,
+                                  struct smb2_tree *tree)
+{
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       bool ret = true;
+       int i;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_open_oplock_%s.dat", generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       /* test various oplock levels with durable open */
+
+       for (i = 0; i < NUM_OPLOCK_OPEN_TESTS; i++) {
+               ret = test_one_durable_open_open_oplock(tctx,
+                                                       tree,
+                                                       fname,
+                                                       durable_open_vs_oplock_table[i]);
+               if (ret == false) {
+                       goto done;
+               }
+       }
+
+done:
+       smb2_util_unlink(tree, fname);
+       talloc_free(tree);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+/**
+ * basic durable_open test.
+ * durable state should only be granted when requested
+ * along with a batch oplock or a handle lease.
+ *
+ * This test tests durable open with all valid lease types.
+ */
+
+struct durable_open_vs_lease {
+       const char *type;
+       const char *share_mode;
+       bool expected;
+};
+
+#define NUM_LEASE_TYPES 5
+#define NUM_LEASE_OPEN_TESTS ( NUM_LEASE_TYPES * NUM_SHARE_MODES )
+static struct durable_open_vs_lease durable_open_vs_lease_table[NUM_LEASE_OPEN_TESTS] =
+{
+       { "", "", false },
+       { "", "R", false },
+       { "", "W", false },
+       { "", "D", false },
+       { "", "RW", false },
+       { "", "RD", false },
+       { "", "WD", false },
+       { "", "RWD", false },
+
+       { "R", "", false },
+       { "R", "R", false },
+       { "R", "W", false },
+       { "R", "D", false },
+       { "R", "RW", false },
+       { "R", "RD", false },
+       { "R", "DW", false },
+       { "R", "RWD", false },
+
+       { "RW", "", false },
+       { "RW", "R", false },
+       { "RW", "W", false },
+       { "RW", "D", false },
+       { "RW", "RW", false },
+       { "RW", "RD", false },
+       { "RW", "WD", false },
+       { "RW", "RWD", false },
+
+       { "RH", "", true },
+       { "RH", "R", true },
+       { "RH", "W", true },
+       { "RH", "D", true },
+       { "RH", "RW", true },
+       { "RH", "RD", true },
+       { "RH", "WD", true },
+       { "RH", "RWD", true },
+
+       { "RHW", "", true },
+       { "RHW", "R", true },
+       { "RHW", "W", true },
+       { "RHW", "D", true },
+       { "RHW", "RW", true },
+       { "RHW", "RD", true },
+       { "RHW", "WD", true },
+       { "RHW", "RWD", true },
+};
+
+static bool test_one_durable_open_open_lease(struct torture_context *tctx,
+                                            struct smb2_tree *tree,
+                                            const char *fname,
+                                            struct durable_open_vs_lease test)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       bool ret = true;
+       struct smb2_create io;
+       struct smb2_lease ls;
+       uint64_t lease;
+       uint32_t caps;
+
+       caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
+       if (!(caps & SMB2_CAP_LEASING)) {
+               torture_skip(tctx, "leases are not supported");
+       }
+
+       smb2_util_unlink(tree, fname);
+
+       lease = random();
+
+       smb2_lease_create_share(&io, &ls, false /* dir */, fname,
+                               smb2_util_share_access(test.share_mode),
+                               lease,
+                               smb2_util_lease_state(test.type));
+       io.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io.out.durable_open, test.expected);
+       CHECK_VAL(io.out.oplock_level, SMB2_OPLOCK_LEVEL_LEASE);
+       CHECK_VAL(io.out.lease_response.lease_key.data[0], lease);
+       CHECK_VAL(io.out.lease_response.lease_key.data[1], ~lease);
+       CHECK_VAL(io.out.lease_response.lease_state,
+                 smb2_util_lease_state(test.type));
+done:
+       if (h != NULL) {
+               smb2_util_close(tree, *h);
+       }
+       smb2_util_unlink(tree, fname);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+bool test_durable_open_open_lease(struct torture_context *tctx,
+                                 struct smb2_tree *tree)
+{
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       bool ret = true;
+       int i;
+       uint32_t caps;
+
+       caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
+       if (!(caps & SMB2_CAP_LEASING)) {
+               torture_skip(tctx, "leases are not supported");
+       }
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_open_lease_%s.dat", generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+
+       /* test various oplock levels with durable open */
+
+       for (i = 0; i < NUM_LEASE_OPEN_TESTS; i++) {
+               ret = test_one_durable_open_open_lease(tctx,
+                                                      tree,
+                                                      fname,
+                                                      durable_open_vs_lease_table[i]);
+               if (ret == false) {
+                       goto done;
+               }
+       }
+
+done:
+       smb2_util_unlink(tree, fname);
+       talloc_free(tree);
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+/**
+ * basic test for doing a durable open
+ * and do a durable reopen on the same connection
+ * while the first open is still active (fails)
+ */
+bool test_durable_open_reopen1(struct torture_context *tctx,
+                              struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2;
+       bool ret = true;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_reopen1_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       /* try a durable reconnect while the file is still open */
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+
+       status = smb2_create(tree, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree, *h);
+       }
+
+       smb2_util_unlink(tree, fname);
+
+       talloc_free(tree);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+/**
+ * basic test for doing a durable open
+ * tcp disconnect, reconnect, do a durable reopen (succeeds)
+ */
+bool test_durable_open_reopen2(struct torture_context *tctx,
+                              struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2;
+       bool ret = true;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_reopen2_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       /* disconnect, reconnect and then do durable reopen */
+       talloc_free(tree);
+       tree = NULL;
+
+       if (!torture_smb2_connection(tctx, &tree)) {
+               torture_warning(tctx, "couldn't reconnect, bailing\n");
+               ret = false;
+               goto done;
+       }
+
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+       h = NULL;
+
+       status = smb2_create(tree, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io2.out.durable_open, true);
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+       _h = io2.out.file.handle;
+       h = &_h;
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree, *h);
+       }
+
+       smb2_util_unlink(tree, fname);
+
+       talloc_free(tree);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+/**
+ * basic test for doing a durable open
+ * tcp disconnect, reconnect with a session reconnect and
+ * do a durable reopen (succeeds)
+ */
+bool test_durable_open_reopen2a(struct torture_context *tctx,
+                               struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2;
+       uint64_t previous_session_id;
+       bool ret = true;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_reopen2_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       /* disconnect, reconnect and then do durable reopen */
+       previous_session_id = smb2cli_session_current_id(tree->session->smbXcli);
+       talloc_free(tree);
+       tree = NULL;
+
+       if (!torture_smb2_connection_ext(tctx, previous_session_id, &tree)) {
+               torture_warning(tctx, "couldn't reconnect, bailing\n");
+               ret = false;
+               goto done;
+       }
+
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+       h = NULL;
+
+       status = smb2_create(tree, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io2.out.durable_open, true);
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+       _h = io2.out.file.handle;
+       h = &_h;
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree, *h);
+       }
+
+       smb2_util_unlink(tree, fname);
+
+       talloc_free(tree);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+
+/**
+ * basic test for doing a durable open:
+ * tdis, new tcon, try durable reopen (fails)
+ */
+bool test_durable_open_reopen3(struct torture_context *tctx,
+                              struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2;
+       bool ret = true;
+       struct smb2_tree *tree2;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_reopen3_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       /* disconnect, reconnect and then do durable reopen */
+       status = smb2_tdis(tree);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       if (!torture_smb2_tree_connect(tctx, tree->session, mem_ctx, &tree2)) {
+               torture_warning(tctx, "couldn't reconnect to share, bailing\n");
+               ret = false;
+               goto done;
+       }
+
+
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+
+       status = smb2_create(tree2, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree, *h);
+       }
+
+       smb2_util_unlink(tree2, fname);
+
+       talloc_free(tree);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+/**
+ * basic test for doing a durable open:
+ * logoff, create a new session, do a durable reopen (succeeds)
+ */
+bool test_durable_open_reopen4(struct torture_context *tctx,
+                              struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2;
+       bool ret = true;
+       struct smb2_transport *transport;
+       struct smb2_session *session2;
+       struct smb2_tree *tree2;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_reopen4_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+       io1.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       /*
+        * do a session logoff, establish a new session and tree
+        * connect on the same transport, and try a durable reopen
+        */
+       transport = tree->session->transport;
+       status = smb2_logoff(tree->session);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       if (!torture_smb2_session_setup(tctx, transport,
+                                       0, /* previous_session_id */
+                                       mem_ctx, &session2))
+       {
+               torture_warning(tctx, "session setup failed.\n");
+               ret = false;
+               goto done;
+       }
+
+       /*
+        * the session setup has talloc-stolen the transport,
+        * so we can safely free the old tree+session for clarity
+        */
+       TALLOC_FREE(tree);
+
+       if (!torture_smb2_tree_connect(tctx, session2, mem_ctx, &tree2)) {
+               torture_warning(tctx, "tree connect failed.\n");
+               ret = false;
+               goto done;
+       }
+
+       ZERO_STRUCT(io2);
+       io2.in.fname = fname;
+       io2.in.durable_handle = h;
+       h = NULL;
+
+       status = smb2_create(tree2, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       _h = io2.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io2.out.durable_open, true);
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree2, *h);
+       }
+
+       smb2_util_unlink(tree2, fname);
+
+       talloc_free(tree);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
+
+bool test_durable_open_delete_on_close1(struct torture_context *tctx,
+                                       struct smb2_tree *tree)
+{
+       NTSTATUS status;
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       char fname[256];
+       struct smb2_handle _h;
+       struct smb2_handle *h = NULL;
+       struct smb2_create io1, io2, io3;
+       bool ret = true;
+       struct smb2_transport *transport;
+       struct smb2_session *session2;
+       struct smb2_tree *tree2;
+       union smb_fileinfo info1, info2;
+
+       /* Choose a random name in case the state is left a little funky. */
+       snprintf(fname, 256, "durable_open_delete_on_close1_%s.dat",
+                generate_random_str(tctx, 8));
+
+       smb2_util_unlink(tree, fname);
+
+       smb2_oplock_create_share(&io1, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io1.in.durable_open = true;
+       io1.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE;
+
+       status = smb2_create(tree, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io1.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, smb2_util_oplock_level("b"));
+
+       ZERO_STRUCT(info1);
+       info1.internal_information.level = RAW_FILEINFO_INTERNAL_INFORMATION;
+       info1.internal_information.in.file.handle = _h;
+       status = smb2_getinfo_file(tree, tree, &info1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       /*
+        * do a session logoff, establish a new session and tree
+        * connect on the same transport, and try a durable reopen
+        */
+       transport = tree->session->transport;
+       status = smb2_logoff(tree->session);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       if (!torture_smb2_session_setup(tctx, transport,
+                                       0, /* previous_session_id */
+                                       mem_ctx, &session2))
+       {
+               torture_warning(tctx, "session setup failed.\n");
+               ret = false;
+               goto done;
+       }
+
+       /*
+        * the session setup has talloc-stolen the transport,
+        * so we can safely free the old tree+session for clarity
+        */
+       TALLOC_FREE(tree);
+
+       if (!torture_smb2_tree_connect(tctx, session2, mem_ctx, &tree2)) {
+               torture_warning(tctx, "tree connect failed.\n");
+               ret = false;
+               goto done;
+       }
+
+       ZERO_STRUCT(io3);
+       io3.in.fname = fname;
+       io3.in.durable_handle = h;
+       h = NULL;
+
+       smb2_oplock_create_share(&io2, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io2.in.create_options |= NTCREATEX_OPTIONS_DELETE_ON_CLOSE;
+
+       status = smb2_create(tree2, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       _h = io2.out.file.handle;
+       h = &_h;
+       CHECK_CREATED(&io2, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io2.out.durable_open, false);
+       CHECK_VAL(io2.out.oplock_level, smb2_util_oplock_level("b"));
+
+       ZERO_STRUCT(info2);
+       info2.internal_information.level = RAW_FILEINFO_INTERNAL_INFORMATION;
+       info2.internal_information.in.file.handle = _h;
+       status = smb2_getinfo_file(tree2, tree2, &info2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       CHECK_NOT_VAL(info1.internal_information.out.file_id,
+                     info2.internal_information.out.file_id);
+
+       status = smb2_create(tree2, mem_ctx, &io3);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+
+done:
+       if (h != NULL) {
+               smb2_util_close(tree2, *h);
+       }
+
+       smb2_util_unlink(tree2, fname);
+
+       talloc_free(tree);
+       talloc_free(tree2);
+
+       talloc_free(mem_ctx);
+
+       return ret;
+}
 
 /*
    basic testing of SMB2 durable opens
@@ -69,29 +841,14 @@ bool test_durable_open_file_position(struct torture_context *tctx,
 
        smb2_util_unlink(tree1, fname);
 
-       ZERO_STRUCT(io1);
-       io1.in.security_flags           = 0x00;
-       io1.in.oplock_level             = SMB2_OPLOCK_LEVEL_BATCH;
-       io1.in.impersonation_level      = NTCREATEX_IMPERSONATION_IMPERSONATION;
-       io1.in.create_flags             = 0x00000000;
-       io1.in.reserved                 = 0x00000000;
-       io1.in.desired_access           = SEC_RIGHTS_FILE_ALL;
-       io1.in.file_attributes          = FILE_ATTRIBUTE_NORMAL;
-       io1.in.share_access             = NTCREATEX_SHARE_ACCESS_READ |
-                                         NTCREATEX_SHARE_ACCESS_WRITE |
-                                         NTCREATEX_SHARE_ACCESS_DELETE;
-       io1.in.create_disposition       = NTCREATEX_DISP_OPEN_IF;
-       io1.in.create_options           = NTCREATEX_OPTIONS_SEQUENTIAL_ONLY |
-                                         NTCREATEX_OPTIONS_ASYNC_ALERT |
-                                         NTCREATEX_OPTIONS_NON_DIRECTORY_FILE |
-                                         0x00200000;
-       io1.in.durable_open             = true;
-       io1.in.fname                    = fname;
+       smb2_oplock_create(&io1, fname, SMB2_OPLOCK_LEVEL_BATCH);
+       io1.in.durable_open = true;
 
        status = smb2_create(tree1, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h1 = io1.out.file.handle;
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
        CHECK_VAL(io1.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
 
        /* TODO: check extra blob content */
@@ -138,6 +895,7 @@ bool test_durable_open_file_position(struct torture_context *tctx,
 
        status = smb2_create(tree2, mem_ctx, &io2);
        CHECK_STATUS(status, NT_STATUS_OK);
+       CHECK_VAL(io2.out.durable_open, true);
        CHECK_VAL(io2.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
        CHECK_VAL(io2.out.reserved, 0x00);
        CHECK_VAL(io2.out.create_action, NTCREATEX_ACTION_EXISTED);
@@ -164,6 +922,9 @@ bool test_durable_open_file_position(struct torture_context *tctx,
 
        smb2_util_unlink(tree2, fname);
 done:
+       talloc_free(tree1);
+       talloc_free(tree2);
+
        return ret;
 }
 
@@ -182,38 +943,23 @@ bool test_durable_open_oplock(struct torture_context *tctx,
        bool ret = true;
 
        /* Choose a random name in case the state is left a little funky. */
-       snprintf(fname, 256, "durable_open_lease_%s.dat", generate_random_str(tctx, 8));
+       snprintf(fname, 256, "durable_open_oplock_%s.dat", generate_random_str(tctx, 8));
 
        /* Clean slate */
        smb2_util_unlink(tree1, fname);
 
        /* Create with batch oplock */
-       ZERO_STRUCT(io1);
-       io1.in.security_flags           = 0x00;
-       io1.in.oplock_level             = SMB2_OPLOCK_LEVEL_BATCH;
-       io1.in.impersonation_level      = NTCREATEX_IMPERSONATION_IMPERSONATION;
-       io1.in.create_flags             = 0x00000000;
-       io1.in.reserved                 = 0x00000000;
-       io1.in.desired_access           = SEC_RIGHTS_FILE_ALL;
-       io1.in.file_attributes          = FILE_ATTRIBUTE_NORMAL;
-       io1.in.share_access             = NTCREATEX_SHARE_ACCESS_READ |
-                                         NTCREATEX_SHARE_ACCESS_WRITE |
-                                         NTCREATEX_SHARE_ACCESS_DELETE;
-       io1.in.create_disposition       = NTCREATEX_DISP_OPEN_IF;
-       io1.in.create_options           = NTCREATEX_OPTIONS_SEQUENTIAL_ONLY |
-                                         NTCREATEX_OPTIONS_ASYNC_ALERT |
-                                         NTCREATEX_OPTIONS_NON_DIRECTORY_FILE |
-                                         0x00200000;
-       io1.in.fname                    = fname;
-       io1.in.durable_open             = true;
+       smb2_oplock_create(&io1, fname, SMB2_OPLOCK_LEVEL_BATCH);
+       io1.in.durable_open = true;
 
        io2 = io1;
-       io2.in.create_disposition       = NTCREATEX_DISP_OPEN;
+       io2.in.create_disposition = NTCREATEX_DISP_OPEN;
 
        status = smb2_create(tree1, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h1 = io1.out.file.handle;
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
        CHECK_VAL(io1.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
 
        /* Disconnect after getting the batch */
@@ -229,6 +975,7 @@ bool test_durable_open_oplock(struct torture_context *tctx,
        CHECK_STATUS(status, NT_STATUS_OK);
        h2 = io2.out.file.handle;
        CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io2.out.durable_open, true);
        CHECK_VAL(io2.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
 
        /* What if tree1 tries to come back and reclaim? */
@@ -249,6 +996,9 @@ bool test_durable_open_oplock(struct torture_context *tctx,
        smb2_util_close(tree2, h2);
        smb2_util_unlink(tree2, fname);
 
+       talloc_free(tree1);
+       talloc_free(tree2);
+
        return ret;
 }
 
@@ -267,6 +1017,12 @@ bool test_durable_open_lease(struct torture_context *tctx,
        char fname[256];
        bool ret = true;
        uint64_t lease1, lease2;
+       uint32_t caps;
+
+       caps = smb2cli_conn_server_capabilities(tree1->session->transport->conn);
+       if (!(caps & SMB2_CAP_LEASING)) {
+               torture_skip(tctx, "leases are not supported");
+       }
 
        /*
         * Choose a random name and random lease in case the state is left a
@@ -280,41 +1036,19 @@ bool test_durable_open_lease(struct torture_context *tctx,
        smb2_util_unlink(tree1, fname);
 
        /* Create with lease */
-       ZERO_STRUCT(io1);
-       io1.in.security_flags           = 0x00;
-       io1.in.oplock_level             = SMB2_OPLOCK_LEVEL_LEASE;
-       io1.in.impersonation_level      = NTCREATEX_IMPERSONATION_IMPERSONATION;
-       io1.in.create_flags             = 0x00000000;
-       io1.in.reserved                 = 0x00000000;
-       io1.in.desired_access           = SEC_RIGHTS_FILE_ALL;
-       io1.in.file_attributes          = FILE_ATTRIBUTE_NORMAL;
-       io1.in.share_access             = NTCREATEX_SHARE_ACCESS_READ |
-                                         NTCREATEX_SHARE_ACCESS_WRITE |
-                                         NTCREATEX_SHARE_ACCESS_DELETE;
-       io1.in.create_disposition       = NTCREATEX_DISP_OPEN_IF;
-       io1.in.create_options           = NTCREATEX_OPTIONS_SEQUENTIAL_ONLY |
-                                         NTCREATEX_OPTIONS_ASYNC_ALERT |
-                                         NTCREATEX_OPTIONS_NON_DIRECTORY_FILE |
-                                         0x00200000;
-       io1.in.fname                    = fname;
-       io1.in.durable_open             = true;
-
-       ZERO_STRUCT(ls1);
-       ls1.lease_key.data[0] = lease1;
-       ls1.lease_key.data[1] = ~lease1;
-       ls1.lease_state = SMB2_LEASE_READ|SMB2_LEASE_HANDLE|SMB2_LEASE_WRITE;
-       io1.in.lease_request = &ls1;
+       smb2_lease_create(&io1, &ls1, false /* dir */, fname,
+                         lease1, smb2_util_lease_state("RHW"));
+       io1.in.durable_open = true;
 
-       io2 = io1;
-       ls2 = ls1;
-       ls2.lease_key.data[0] = lease2;
-       ls2.lease_key.data[1] = ~lease2;
-       io2.in.lease_request = &ls2;
+       smb2_lease_create(&io2, &ls2, false /* dir */, fname,
+                         lease2, smb2_util_lease_state("RHW"));
+       io2.in.durable_open = true;
        io2.in.create_disposition = NTCREATEX_DISP_OPEN;
 
        status = smb2_create(tree1, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h1 = io1.out.file.handle;
+       CHECK_VAL(io1.out.durable_open, true);
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
 
        CHECK_VAL(io1.out.oplock_level, SMB2_OPLOCK_LEVEL_LEASE);
@@ -331,17 +1065,21 @@ bool test_durable_open_lease(struct torture_context *tctx,
         * Windows7 (build 7000) will grant an RH lease immediate (not an RHW?)
         * even if the original client is gone. (ZML: This seems like a bug. It
         * should give some time for the client to reconnect! And why RH?)
+        * 
+        * obnox: Current windows 7 and w2k8r2 grant RHW instead of RH.
+        * Test is adapted accordingly.
         */
        status = smb2_create(tree2, mem_ctx, &io2);
        CHECK_STATUS(status, NT_STATUS_OK);
        h2 = io2.out.file.handle;
+       CHECK_VAL(io2.out.durable_open, true);
        CHECK_CREATED(&io2, EXISTED, FILE_ATTRIBUTE_ARCHIVE);
 
        CHECK_VAL(io2.out.oplock_level, SMB2_OPLOCK_LEVEL_LEASE);
        CHECK_VAL(io2.out.lease_response.lease_key.data[0], lease2);
        CHECK_VAL(io2.out.lease_response.lease_key.data[1], ~lease2);
        CHECK_VAL(io2.out.lease_response.lease_state,
-           SMB2_LEASE_READ|SMB2_LEASE_HANDLE);
+           SMB2_LEASE_READ|SMB2_LEASE_HANDLE|SMB2_LEASE_WRITE);
 
        /* What if tree1 tries to come back and reclaim? */
        if (!torture_smb2_connection(tctx, &tree1)) {
@@ -362,14 +1100,95 @@ bool test_durable_open_lease(struct torture_context *tctx,
        smb2_util_close(tree2, h2);
        smb2_util_unlink(tree2, fname);
 
+       talloc_free(tree1);
+       talloc_free(tree2);
+
+       return ret;
+}
+
+bool test_durable_open_lock_oplock(struct torture_context *tctx,
+                                  struct smb2_tree *tree)
+{
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       struct smb2_create io;
+       struct smb2_handle h;
+       struct smb2_lock lck;
+       struct smb2_lock_element el[2];
+       NTSTATUS status;
+       char fname[256];
+       bool ret = true;
+
+       /*
+        */
+       snprintf(fname, 256, "durable_open_oplock_lock_%s.dat", generate_random_str(tctx, 8));
+
+       /* Clean slate */
+       smb2_util_unlink(tree, fname);
+
+       /* Create with lease */
+
+       smb2_oplock_create_share(&io, fname,
+                                smb2_util_share_access(""),
+                                smb2_util_oplock_level("b"));
+       io.in.durable_open = true;
+
+       status = smb2_create(tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       h = io.out.file.handle;
+       CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+
+       CHECK_VAL(io.out.durable_open, true);
+       CHECK_VAL(io.out.oplock_level, smb2_util_oplock_level("b"));
+
+       ZERO_STRUCT(lck);
+       ZERO_STRUCT(el);
+       lck.in.locks            = el;
+       lck.in.lock_count       = 0x0001;
+       lck.in.lock_sequence    = 0x00000000;
+       lck.in.file.handle      = h;
+       el[0].offset            = 0;
+       el[0].length            = 1;
+       el[0].reserved          = 0x00000000;
+       el[0].flags             = SMB2_LOCK_FLAG_EXCLUSIVE;
+       status = smb2_lock(tree, &lck);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+       /* Disconnect/Reconnect. */
+       talloc_free(tree);
+       tree = NULL;
+
+       if (!torture_smb2_connection(tctx, &tree)) {
+               torture_warning(tctx, "couldn't reconnect, bailing\n");
+               ret = false;
+               goto done;
+       }
+
+       ZERO_STRUCT(io);
+       io.in.fname = fname;
+       io.in.durable_handle = &h;
+
+       status = smb2_create(tree, mem_ctx, &io);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       h = io.out.file.handle;
+
+       lck.in.file.handle      = h;
+       el[0].flags             = SMB2_LOCK_FLAG_UNLOCK;
+       status = smb2_lock(tree, &lck);
+       CHECK_STATUS(status, NT_STATUS_OK);
+
+ done:
+       smb2_util_close(tree, h);
+       smb2_util_unlink(tree, fname);
+       talloc_free(tree);
+
        return ret;
 }
 
 /*
   Open, take BRL, disconnect, reconnect.
 */
-bool test_durable_open_lock(struct torture_context *tctx,
-                           struct smb2_tree *tree)
+bool test_durable_open_lock_lease(struct torture_context *tctx,
+                                 struct smb2_tree *tree)
 {
        TALLOC_CTX *mem_ctx = talloc_new(tctx);
        struct smb2_create io;
@@ -381,48 +1200,35 @@ bool test_durable_open_lock(struct torture_context *tctx,
        char fname[256];
        bool ret = true;
        uint64_t lease;
+       uint32_t caps;
+
+       caps = smb2cli_conn_server_capabilities(tree->session->transport->conn);
+       if (!(caps & SMB2_CAP_LEASING)) {
+               torture_skip(tctx, "leases are not supported");
+       }
 
        /*
         * Choose a random name and random lease in case the state is left a
         * little funky.
         */
        lease = random();
-       snprintf(fname, 256, "durable_open_lock_%s.dat", generate_random_str(tctx, 8));
+       snprintf(fname, 256, "durable_open_lease_lock_%s.dat", generate_random_str(tctx, 8));
 
        /* Clean slate */
        smb2_util_unlink(tree, fname);
 
        /* Create with lease */
-       ZERO_STRUCT(io);
-       io.in.security_flags            = 0x00;
-       io.in.oplock_level              = SMB2_OPLOCK_LEVEL_LEASE;
-       io.in.impersonation_level       = NTCREATEX_IMPERSONATION_IMPERSONATION;
-       io.in.create_flags              = 0x00000000;
-       io.in.reserved                  = 0x00000000;
-       io.in.desired_access            = SEC_RIGHTS_FILE_ALL;
-       io.in.file_attributes           = FILE_ATTRIBUTE_NORMAL;
-       io.in.share_access              = NTCREATEX_SHARE_ACCESS_READ |
-                                         NTCREATEX_SHARE_ACCESS_WRITE |
-                                         NTCREATEX_SHARE_ACCESS_DELETE;
-       io.in.create_disposition        = NTCREATEX_DISP_OPEN_IF;
-       io.in.create_options            = NTCREATEX_OPTIONS_SEQUENTIAL_ONLY |
-                                         NTCREATEX_OPTIONS_ASYNC_ALERT |
-                                         NTCREATEX_OPTIONS_NON_DIRECTORY_FILE |
-                                         0x00200000;
-       io.in.fname                     = fname;
-       io.in.durable_open              = true;
 
-       ZERO_STRUCT(ls);
-       ls.lease_key.data[0] = lease;
-       ls.lease_key.data[1] = ~lease;
-       ls.lease_state = SMB2_LEASE_READ|SMB2_LEASE_HANDLE|SMB2_LEASE_WRITE;
-       io.in.lease_request = &ls;
+       smb2_lease_create(&io, &ls, false /* dir */, fname, lease,
+                         smb2_util_lease_state("RWH"));
+       io.in.durable_open              = true;
 
        status = smb2_create(tree, mem_ctx, &io);
        CHECK_STATUS(status, NT_STATUS_OK);
        h = io.out.file.handle;
        CHECK_CREATED(&io, CREATED, FILE_ATTRIBUTE_ARCHIVE);
 
+       CHECK_VAL(io.out.durable_open, true);
        CHECK_VAL(io.out.oplock_level, SMB2_OPLOCK_LEVEL_LEASE);
        CHECK_VAL(io.out.lease_response.lease_key.data[0], lease);
        CHECK_VAL(io.out.lease_response.lease_key.data[1], ~lease);
@@ -469,21 +1275,22 @@ bool test_durable_open_lock(struct torture_context *tctx,
  done:
        smb2_util_close(tree, h);
        smb2_util_unlink(tree, fname);
+       talloc_free(tree);
 
        return ret;
 }
 
-/*
 Open, disconnect, open in another tree, reconnect.
-
-  This test actually demonstrates a minimum level of respect for the durable
-  open in the face of another open. As long as this test shows an inability to
-  reconnect after an open, the oplock/lease tests above will certainly
-  demonstrate an error on reconnect.
-*/
-bool test_durable_open_open(struct torture_context *tctx,
-                           struct smb2_tree *tree1,
-                           struct smb2_tree *tree2)
+/**
* Open with a RH lease, disconnect, open in another tree, reconnect.
+ *
* This test actually demonstrates a minimum level of respect for the durable
* open in the face of another open. As long as this test shows an inability to
* reconnect after an open, the oplock/lease tests above will certainly
* demonstrate an error on reconnect.
+ */
+bool test_durable_open_open2_lease(struct torture_context *tctx,
+                                 struct smb2_tree *tree1,
+                                 struct smb2_tree *tree2)
 {
        TALLOC_CTX *mem_ctx = talloc_new(tctx);
        struct smb2_create io1, io2;
@@ -493,61 +1300,50 @@ bool test_durable_open_open(struct torture_context *tctx,
        char fname[256];
        bool ret = true;
        uint64_t lease;
+       uint32_t caps;
+
+       caps = smb2cli_conn_server_capabilities(tree1->session->transport->conn);
+       if (!(caps & SMB2_CAP_LEASING)) {
+               torture_skip(tctx, "leases are not supported");
+       }
 
        /*
         * Choose a random name and random lease in case the state is left a
         * little funky.
         */
        lease = random();
-       snprintf(fname, 256, "durable_open_lock_%s.dat", generate_random_str(tctx, 8));
+       snprintf(fname, 256, "durable_open_open2_lease_%s.dat",
+                generate_random_str(tctx, 8));
 
        /* Clean slate */
        smb2_util_unlink(tree1, fname);
 
        /* Create with lease */
-       ZERO_STRUCT(io1);
-       io1.in.security_flags           = 0x00;
-       io1.in.oplock_level             = SMB2_OPLOCK_LEVEL_LEASE;
-       io1.in.impersonation_level      = NTCREATEX_IMPERSONATION_IMPERSONATION;
-       io1.in.create_flags             = 0x00000000;
-       io1.in.reserved                 = 0x00000000;
-       io1.in.desired_access           = SEC_RIGHTS_FILE_ALL;
-       io1.in.file_attributes          = FILE_ATTRIBUTE_NORMAL;
-       io1.in.share_access             = NTCREATEX_SHARE_ACCESS_NONE;
-       io1.in.create_disposition       = NTCREATEX_DISP_OPEN_IF;
-       io1.in.create_options           = NTCREATEX_OPTIONS_SEQUENTIAL_ONLY |
-                                         NTCREATEX_OPTIONS_ASYNC_ALERT |
-                                         NTCREATEX_OPTIONS_NON_DIRECTORY_FILE |
-                                         0x00200000;
-       io1.in.fname                    = fname;
-       io1.in.durable_open             = true;
-
-       io2 = io1;
-       io2.in.oplock_level = SMB2_OPLOCK_LEVEL_NONE;
-       io2.in.durable_open = false;
-
-       ZERO_STRUCT(ls);
-       ls.lease_key.data[0] = lease;
-       ls.lease_key.data[1] = ~lease;
-       ls.lease_state = SMB2_LEASE_READ|SMB2_LEASE_HANDLE;
-       io1.in.lease_request = &ls;
+       smb2_lease_create_share(&io1, &ls, false /* dir */, fname,
+                               smb2_util_share_access(""),
+                               lease,
+                               smb2_util_lease_state("RH"));
+       io1.in.durable_open = true;
 
        status = smb2_create(tree1, mem_ctx, &io1);
        CHECK_STATUS(status, NT_STATUS_OK);
        h1 = io1.out.file.handle;
+       CHECK_VAL(io1.out.durable_open, true);
        CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
 
        CHECK_VAL(io1.out.oplock_level, SMB2_OPLOCK_LEVEL_LEASE);
        CHECK_VAL(io1.out.lease_response.lease_key.data[0], lease);
        CHECK_VAL(io1.out.lease_response.lease_key.data[1], ~lease);
        CHECK_VAL(io1.out.lease_response.lease_state,
-           SMB2_LEASE_READ|SMB2_LEASE_HANDLE);
+                 smb2_util_lease_state("RH"));
 
        /* Disconnect */
        talloc_free(tree1);
        tree1 = NULL;
 
        /* Open the file in tree2 */
+       smb2_oplock_create(&io2, fname, SMB2_OPLOCK_LEVEL_NONE);
+
        status = smb2_create(tree2, mem_ctx, &io2);
        CHECK_STATUS(status, NT_STATUS_OK);
        h2 = io2.out.file.handle;
@@ -580,20 +1376,115 @@ bool test_durable_open_open(struct torture_context *tctx,
        smb2_util_close(tree1, h1);
        smb2_util_unlink(tree1, fname);
 
+       talloc_free(tree1);
+       talloc_free(tree2);
+
+       return ret;
+}
+
+/**
+ * Open with a batch oplock, disconnect, open in another tree, reconnect.
+ *
+ * This test actually demonstrates a minimum level of respect for the durable
+ * open in the face of another open. As long as this test shows an inability to
+ * reconnect after an open, the oplock/lease tests above will certainly
+ * demonstrate an error on reconnect.
+ */
+bool test_durable_open_open2_oplock(struct torture_context *tctx,
+                                   struct smb2_tree *tree1,
+                                   struct smb2_tree *tree2)
+{
+       TALLOC_CTX *mem_ctx = talloc_new(tctx);
+       struct smb2_create io1, io2;
+       struct smb2_handle h1, h2;
+       NTSTATUS status;
+       char fname[256];
+       bool ret = true;
+
+       /*
+        * Choose a random name and random lease in case the state is left a
+        * little funky.
+        */
+       snprintf(fname, 256, "durable_open_open2_oplock_%s.dat",
+                generate_random_str(tctx, 8));
+
+       /* Clean slate */
+       smb2_util_unlink(tree1, fname);
+
+       /* Create with batch oplock */
+       smb2_oplock_create(&io1, fname, SMB2_OPLOCK_LEVEL_BATCH);
+       io1.in.durable_open = true;
+
+       status = smb2_create(tree1, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       h1 = io1.out.file.handle;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+       CHECK_VAL(io1.out.durable_open, true);
+       CHECK_VAL(io1.out.oplock_level, SMB2_OPLOCK_LEVEL_BATCH);
+
+       /* Disconnect */
+       talloc_free(tree1);
+       tree1 = NULL;
+
+       /* Open the file in tree2 */
+       smb2_oplock_create(&io2, fname, SMB2_OPLOCK_LEVEL_NONE);
+
+       status = smb2_create(tree2, mem_ctx, &io2);
+       CHECK_STATUS(status, NT_STATUS_OK);
+       h2 = io2.out.file.handle;
+       CHECK_CREATED(&io1, CREATED, FILE_ATTRIBUTE_ARCHIVE);
+
+       /* Reconnect */
+       if (!torture_smb2_connection(tctx, &tree1)) {
+               torture_warning(tctx, "couldn't reconnect, bailing\n");
+               ret = false;
+               goto done;
+       }
+
+       ZERO_STRUCT(io1);
+       io1.in.fname = fname;
+       io1.in.durable_handle = &h1;
+
+       status = smb2_create(tree1, mem_ctx, &io1);
+       CHECK_STATUS(status, NT_STATUS_OBJECT_NAME_NOT_FOUND);
+       h1 = io1.out.file.handle;
+
+ done:
+       smb2_util_close(tree2, h2);
+       smb2_util_unlink(tree2, fname);
+       smb2_util_close(tree1, h1);
+       smb2_util_unlink(tree1, fname);
+
+       talloc_free(tree1);
+       talloc_free(tree2);
+
        return ret;
 }
 
 struct torture_suite *torture_smb2_durable_open_init(void)
 {
        struct torture_suite *suite =
-           torture_suite_create(talloc_autofree_context(), "DURABLE-OPEN");
-
-       torture_suite_add_2smb2_test(suite, "FILE-POSITION",
+           torture_suite_create(talloc_autofree_context(), "durable-open");
+
+       torture_suite_add_1smb2_test(suite, "open-oplock", test_durable_open_open_oplock);
+       torture_suite_add_1smb2_test(suite, "open-lease", test_durable_open_open_lease);
+       torture_suite_add_1smb2_test(suite, "reopen1", test_durable_open_reopen1);
+       torture_suite_add_1smb2_test(suite, "reopen2", test_durable_open_reopen2);
+       torture_suite_add_1smb2_test(suite, "reopen2a", test_durable_open_reopen2a);
+       torture_suite_add_1smb2_test(suite, "reopen3", test_durable_open_reopen3);
+       torture_suite_add_1smb2_test(suite, "reopen4", test_durable_open_reopen4);
+       torture_suite_add_1smb2_test(suite, "delete_on_close1",
+                                    test_durable_open_delete_on_close1);
+       torture_suite_add_2smb2_test(suite, "file-position",
            test_durable_open_file_position);
-       torture_suite_add_2smb2_test(suite, "OPLOCK", test_durable_open_oplock);
-       torture_suite_add_2smb2_test(suite, "LEASE", test_durable_open_lease);
-       torture_suite_add_1smb2_test(suite, "LOCK", test_durable_open_lock);
-       torture_suite_add_2smb2_test(suite, "OPEN", test_durable_open_open);
+       torture_suite_add_2smb2_test(suite, "oplock", test_durable_open_oplock);
+       torture_suite_add_2smb2_test(suite, "lease", test_durable_open_lease);
+       torture_suite_add_1smb2_test(suite, "lock-oplock", test_durable_open_lock_oplock);
+       torture_suite_add_1smb2_test(suite, "lock-lease", test_durable_open_lock_lease);
+       torture_suite_add_2smb2_test(suite, "open2-lease",
+                                    test_durable_open_open2_lease);
+       torture_suite_add_2smb2_test(suite, "open2-oplock",
+                                    test_durable_open_open2_oplock);
 
        suite->description = talloc_strdup(suite, "SMB2-DURABLE-OPEN tests");