Correct "succeded" typos.
[nivanova/samba-autobuild/.git] / source3 / smbd / smb2_create.c
index 2173a0dd64184ececc281bba42282da6b5272cdd..cba0781430ecb20c7285e36fe36f2e8e5d89d93c 100644 (file)
@@ -25,6 +25,7 @@
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../librpc/gen_ndr/ndr_smb2_lease_struct.h"
 #include "../lib/util/tevent_ntstatus.h"
 #include "messages.h"
 
@@ -40,9 +41,7 @@ int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
        case SMB2_OPLOCK_LEVEL_BATCH:
                return BATCH_OPLOCK;
        case SMB2_OPLOCK_LEVEL_LEASE:
-               DEBUG(2,("map_smb2_oplock_levels_to_samba: "
-                       "LEASE_OPLOCK_REQUESTED\n"));
-               return NO_OPLOCK;
+               return LEASE_OPLOCK;
        default:
                DEBUG(2,("map_smb2_oplock_levels_to_samba: "
                        "unknown level %u\n",
@@ -58,12 +57,9 @@ static uint8_t map_samba_oplock_levels_to_smb2(int oplock_type)
        } else if (EXCLUSIVE_OPLOCK_TYPE(oplock_type)) {
                return SMB2_OPLOCK_LEVEL_EXCLUSIVE;
        } else if (oplock_type == LEVEL_II_OPLOCK) {
-               /*
-                * Don't use LEVEL_II_OPLOCK_TYPE here as
-                * this also includes FAKE_LEVEL_II_OPLOCKs
-                * which are internal only.
-                */
                return SMB2_OPLOCK_LEVEL_II;
+       } else if (oplock_type == LEASE_OPLOCK) {
+               return SMB2_OPLOCK_LEVEL_LEASE;
        } else {
                return SMB2_OPLOCK_LEVEL_NONE;
        }
@@ -85,10 +81,10 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req,
                        TALLOC_CTX *mem_ctx,
                        uint8_t *out_oplock_level,
                        uint32_t *out_create_action,
-                       NTTIME *out_creation_time,
-                       NTTIME *out_last_access_time,
-                       NTTIME *out_last_write_time,
-                       NTTIME *out_change_time,
+                       struct timespec *out_creation_ts,
+                       struct timespec *out_last_access_ts,
+                       struct timespec *out_last_write_ts,
+                       struct timespec *out_change_ts,
                        uint64_t *out_allocation_size,
                        uint64_t *out_end_of_file,
                        uint32_t *out_file_attributes,
@@ -246,13 +242,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
        }
        tevent_req_set_callback(tsubreq, smbd_smb2_request_create_done, smb2req);
 
-       /*
-        * For now we keep the logic that we do not send STATUS_PENDING
-        * for sharing violations, so we just wait 2 seconds.
-        *
-        * TODO: we need more tests for this.
-        */
-       return smbd_smb2_request_pending_queue(smb2req, tsubreq, 2000000);
+       return smbd_smb2_request_pending_queue(smb2req, tsubreq, 500);
 }
 
 static uint64_t get_mid_from_smb2req(struct smbd_smb2_request *smb2req)
@@ -269,10 +259,11 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
        DATA_BLOB outdyn;
        uint8_t out_oplock_level = 0;
        uint32_t out_create_action = 0;
-       NTTIME out_creation_time = 0;
-       NTTIME out_last_access_time = 0;
-       NTTIME out_last_write_time = 0;
-       NTTIME out_change_time = 0;
+       connection_struct *conn = smb2req->tcon->compat;
+       struct timespec out_creation_ts = { 0, };
+       struct timespec out_last_access_ts = { 0, };
+       struct timespec out_last_write_ts = { 0, };
+       struct timespec out_change_ts = { 0, };
        uint64_t out_allocation_size = 0;
        uint64_t out_end_of_file = 0;
        uint32_t out_file_attributes = 0;
@@ -288,10 +279,10 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
                                       smb2req,
                                       &out_oplock_level,
                                       &out_create_action,
-                                      &out_creation_time,
-                                      &out_last_access_time,
-                                      &out_last_write_time,
-                                      &out_change_time,
+                                      &out_creation_ts,
+                                      &out_last_access_ts,
+                                      &out_last_write_ts,
+                                      &out_change_ts,
                                       &out_allocation_size,
                                       &out_end_of_file,
                                       &out_file_attributes,
@@ -301,7 +292,7 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
        if (!NT_STATUS_IS_OK(status)) {
                error = smbd_smb2_request_error(smb2req, status);
                if (!NT_STATUS_IS_OK(error)) {
-                       smbd_server_connection_terminate(smb2req->sconn,
+                       smbd_server_connection_terminate(smb2req->xconn,
                                                         nt_errstr(error));
                        return;
                }
@@ -312,7 +303,7 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
        if (!NT_STATUS_IS_OK(status)) {
                error = smbd_smb2_request_error(smb2req, status);
                if (!NT_STATUS_IS_OK(error)) {
-                       smbd_server_connection_terminate(smb2req->sconn,
+                       smbd_server_connection_terminate(smb2req->xconn,
                                                         nt_errstr(error));
                        return;
                }
@@ -323,11 +314,11 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
                out_context_buffer_offset = SMB2_HDR_BODY + 0x58;
        }
 
-       outbody = data_blob_talloc(smb2req->out.vector, NULL, 0x58);
+       outbody = smbd_smb2_generate_outbody(smb2req, 0x58);
        if (outbody.data == NULL) {
                error = smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
                if (!NT_STATUS_IS_OK(error)) {
-                       smbd_server_connection_terminate(smb2req->sconn,
+                       smbd_server_connection_terminate(smb2req->xconn,
                                                         nt_errstr(error));
                        return;
                }
@@ -340,14 +331,18 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
        SCVAL(outbody.data, 0x03, 0);           /* reserved */
        SIVAL(outbody.data, 0x04,
              out_create_action);               /* create action */
-       SBVAL(outbody.data, 0x08,
-             out_creation_time);               /* creation time */
-       SBVAL(outbody.data, 0x10,
-             out_last_access_time);            /* last access time */
-       SBVAL(outbody.data, 0x18,
-             out_last_write_time);             /* last write time */
-       SBVAL(outbody.data, 0x20,
-             out_change_time);                 /* change time */
+       put_long_date_timespec(conn->ts_res,
+             (char *)outbody.data + 0x08,
+             out_creation_ts);                 /* creation time */
+       put_long_date_timespec(conn->ts_res,
+             (char *)outbody.data + 0x10,
+             out_last_access_ts);              /* last access time */
+       put_long_date_timespec(conn->ts_res,
+             (char *)outbody.data + 0x18,
+             out_last_write_ts);               /* last write time */
+       put_long_date_timespec(conn->ts_res,
+             (char *)outbody.data + 0x20,
+             out_change_ts);                   /* change time */
        SBVAL(outbody.data, 0x28,
              out_allocation_size);             /* allocation size */
        SBVAL(outbody.data, 0x30,
@@ -368,12 +363,70 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
 
        error = smbd_smb2_request_done(smb2req, outbody, &outdyn);
        if (!NT_STATUS_IS_OK(error)) {
-               smbd_server_connection_terminate(smb2req->sconn,
+               smbd_server_connection_terminate(smb2req->xconn,
                                                 nt_errstr(error));
                return;
        }
 }
 
+static bool smb2_lease_key_valid(const struct smb2_lease_key *key)
+{
+       return ((key->data[0] != 0) || (key->data[1] != 0));
+}
+
+static NTSTATUS smbd_smb2_create_durable_lease_check(struct smb_request *smb1req,
+       const char *requested_filename, const struct files_struct *fsp,
+       const struct smb2_lease *lease_ptr)
+{
+       struct smb_filename *smb_fname = NULL;
+       uint32_t ucf_flags;
+       NTSTATUS status;
+
+       if (lease_ptr == NULL) {
+               if (fsp->oplock_type != LEASE_OPLOCK) {
+                       return NT_STATUS_OK;
+               }
+               DEBUG(10, ("Reopened file has lease, but no lease "
+                          "requested\n"));
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (fsp->oplock_type != LEASE_OPLOCK) {
+               DEBUG(10, ("Lease requested, but reopened file has no "
+                          "lease\n"));
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (!smb2_lease_key_equal(&lease_ptr->lease_key,
+                                 &fsp->lease->lease.lease_key)) {
+               DEBUG(10, ("Different lease key requested than found "
+                          "in reopened file\n"));
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       ucf_flags = filename_create_ucf_flags(smb1req, FILE_OPEN);
+       status = filename_convert(talloc_tos(), fsp->conn, false,
+                                 requested_filename, ucf_flags,
+                                 NULL, &smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(10, ("filename_convert returned %s\n",
+                          nt_errstr(status)));
+               return status;
+       }
+
+       if (!strequal(fsp->fsp_name->base_name, smb_fname->base_name)) {
+               DEBUG(10, ("Lease requested for file %s, reopened file "
+                          "is named %s\n", smb_fname->base_name,
+                          fsp->fsp_name->base_name));
+               TALLOC_FREE(smb_fname);
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       TALLOC_FREE(smb_fname);
+
+       return NT_STATUS_OK;
+}
+
 struct smbd_smb2_create_state {
        struct smbd_smb2_request *smb2req;
        struct smb_request *smb1req;
@@ -382,19 +435,19 @@ struct smbd_smb2_create_state {
        struct tevent_immediate *im;
        struct timeval request_time;
        struct file_id id;
-       DATA_BLOB private_data;
+       struct deferred_open_record *open_rec;
        uint8_t out_oplock_level;
        uint32_t out_create_action;
-       NTTIME out_creation_time;
-       NTTIME out_last_access_time;
-       NTTIME out_last_write_time;
-       NTTIME out_change_time;
+       struct timespec out_creation_ts;
+       struct timespec out_last_access_ts;
+       struct timespec out_last_write_ts;
+       struct timespec out_change_ts;
        uint64_t out_allocation_size;
        uint64_t out_end_of_file;
        uint32_t out_file_attributes;
        uint64_t out_file_id_persistent;
        uint64_t out_file_id_volatile;
-       struct smb2_create_blobs out_context_blobs;
+       struct smb2_create_blobs *out_context_blobs;
 };
 
 static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
@@ -416,14 +469,13 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
        struct smb_request *smb1req = NULL;
        files_struct *result = NULL;
        int info;
-       struct timespec write_time_ts;
-       struct smb2_create_blobs out_context_blobs;
        int requested_oplock_level;
        struct smb2_create_blob *dhnc = NULL;
        struct smb2_create_blob *dh2c = NULL;
-       struct smbXsrv_open *op = NULL;
-
-       ZERO_STRUCT(out_context_blobs);
+       struct smb2_create_blob *dhnq = NULL;
+       struct smb2_create_blob *dh2q = NULL;
+       struct smb2_create_blob *rqls = NULL;
+       bool replay_operation = false;
 
        if(lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
                requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
@@ -455,38 +507,100 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                state = tevent_req_data(req,
                                struct smbd_smb2_create_state);
                smb1req = state->smb1req;
+               TALLOC_FREE(state->out_context_blobs);
                DEBUG(10,("smbd_smb2_create_send: reentrant for file %s\n",
                        in_name ));
        }
 
+       state->out_context_blobs = talloc_zero(state, struct smb2_create_blobs);
+       if (tevent_req_nomem(state->out_context_blobs, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       dhnq = smb2_create_blob_find(&in_context_blobs,
+                                    SMB2_CREATE_TAG_DHNQ);
        dhnc = smb2_create_blob_find(&in_context_blobs,
                                     SMB2_CREATE_TAG_DHNC);
+       dh2q = smb2_create_blob_find(&in_context_blobs,
+                                    SMB2_CREATE_TAG_DH2Q);
+       dh2c = smb2_create_blob_find(&in_context_blobs,
+                                    SMB2_CREATE_TAG_DH2C);
+       if (smb2req->xconn->smb2.server.capabilities & SMB2_CAP_LEASING) {
+               rqls = smb2_create_blob_find(&in_context_blobs,
+                                            SMB2_CREATE_TAG_RQLS);
+       }
+
+       if ((dhnc && dh2c) || (dhnc && dh2q) || (dh2c && dhnq) ||
+           (dh2q && dh2c))
+       {
+               /* not both are allowed at the same time */
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
 
        if (dhnc) {
+               uint32_t num_blobs_allowed;
+
                if (dhnc->data.length != 16) {
                        tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
                        return tevent_req_post(req, ev);
                }
-               if (in_context_blobs.num_blobs != 1) {
-                       /*
-                        * DHNC should be the only one.
-                        */
+
+               /*
+                * According to MS-SMB2: 3.3.5.9.7, "Handling the
+                * SMB2_CREATE_DURABLE_HANDLE_RECONNECT Create Context",
+                * we should ignore an additional dhnq blob, but fail
+                * the request (with status OBJECT_NAME_NOT_FOUND) if
+                * any other extra create blob has been provided.
+                *
+                * (Note that the cases of an additional dh2q or dh2c blob
+                *  which require a different error code, have been treated
+                *  above.)
+                */
+
+               if (dhnq) {
+                       num_blobs_allowed = 2;
+               } else {
+                       num_blobs_allowed = 1;
+               }
+
+               if (rqls != NULL) {
+                       num_blobs_allowed += 1;
+               }
+
+               if (in_context_blobs.num_blobs != num_blobs_allowed) {
                        tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                        return tevent_req_post(req, ev);
                }
        }
 
-       dh2c = smb2_create_blob_find(&in_context_blobs,
-                                    SMB2_CREATE_TAG_DH2C);
        if (dh2c) {
+               uint32_t num_blobs_allowed;
+
                if (dh2c->data.length != 36) {
                        tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
                        return tevent_req_post(req, ev);
                }
-               if (in_context_blobs.num_blobs != 1) {
-                       /*
-                        * DH2C should be the only one.
-                        */
+
+               /*
+                * According to MS-SMB2: 3.3.5.9.12, "Handling the
+                * SMB2_CREATE_DURABLE_HANDLE_RECONNECT_V2 Create Context",
+                * we should fail the request with status
+                * OBJECT_NAME_NOT_FOUND if any other create blob has been
+                * provided.
+                *
+                * (Note that the cases of an additional dhnq, dhnc or dh2q
+                *  blob which require a different error code, have been
+                *  treated above.)
+                */
+
+               num_blobs_allowed = 1;
+
+               if (rqls != NULL) {
+                       num_blobs_allowed += 1;
+               }
+
+               if (in_context_blobs.num_blobs != num_blobs_allowed) {
                        tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                        return tevent_req_post(req, ev);
                }
@@ -541,17 +655,25 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                NTTIME max_access_time = 0;
                struct smb2_create_blob *secd = NULL;
                struct security_descriptor *sec_desc = NULL;
-               struct smb2_create_blob *dhnq = NULL;
                struct smb2_create_blob *alsi = NULL;
                uint64_t allocation_size = 0;
                struct smb2_create_blob *twrp = NULL;
                struct smb2_create_blob *qfid = NULL;
-               struct GUID create_guid = GUID_zero();
+               struct GUID _create_guid = GUID_zero();
+               struct GUID *create_guid = NULL;
                bool update_open = false;
                bool durable_requested = false;
                uint32_t durable_timeout_msec = 0;
                bool do_durable_reconnect = false;
-               struct smb2_create_blob *dh2q = NULL;
+               uint64_t persistent_id = 0;
+               struct smb2_lease lease;
+               struct smb2_lease *lease_ptr = NULL;
+               ssize_t lease_len = -1;
+               bool need_replay_cache = false;
+               struct smbXsrv_open *op = NULL;
+#if 0
+               struct smb2_create_blob *svhdx = NULL;
+#endif
 
                exta = smb2_create_blob_find(&in_context_blobs,
                                             SMB2_CREATE_TAG_EXTA);
@@ -559,16 +681,21 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                             SMB2_CREATE_TAG_MXAC);
                secd = smb2_create_blob_find(&in_context_blobs,
                                             SMB2_CREATE_TAG_SECD);
-               dhnq = smb2_create_blob_find(&in_context_blobs,
-                                            SMB2_CREATE_TAG_DHNQ);
                alsi = smb2_create_blob_find(&in_context_blobs,
                                             SMB2_CREATE_TAG_ALSI);
                twrp = smb2_create_blob_find(&in_context_blobs,
                                             SMB2_CREATE_TAG_TWRP);
                qfid = smb2_create_blob_find(&in_context_blobs,
                                             SMB2_CREATE_TAG_QFID);
-               dh2q = smb2_create_blob_find(&in_context_blobs,
-                                            SMB2_CREATE_TAG_DH2Q);
+#if 0
+               if (smb2req->xconn->protocol >= PROTOCOL_SMB3_02) {
+                       /*
+                        * This was introduced with SMB3_02
+                        */
+                       svhdx = smb2_create_blob_find(&in_context_blobs,
+                                                     SVHDX_OPEN_DEVICE_CONTEXT);
+               }
+#endif
 
                fname = talloc_strdup(state, in_name);
                if (tevent_req_nomem(fname, req)) {
@@ -576,6 +703,12 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                }
 
                if (exta) {
+                       if (!lp_ea_support(SNUM(smb2req->tcon->compat))) {
+                               tevent_req_nterror(req,
+                                       NT_STATUS_EAS_NOT_SUPPORTED);
+                               return tevent_req_post(req, ev);
+                       }
+
                        ea_list = read_nttrans_ea_list(mem_ctx,
                                (const char *)exta->data.data, exta->data.length);
                        if (!ea_list) {
@@ -583,6 +716,17 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
                                return tevent_req_post(req, ev);
                        }
+
+                       /*
+                        * NB. When SMB2+ unix extensions are added,
+                        * we need to relax this check in invalid
+                        * names - we used to not do this if
+                        * lp_posix_pathnames() was false.
+                        */
+                       if (ea_list_has_invalid_name(ea_list)) {
+                               tevent_req_nterror(req, STATUS_INVALID_EA_NAME);
+                               return tevent_req_post(req, ev);
+                       }
                }
 
                if (mxac) {
@@ -643,6 +787,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        const uint8_t *p = dh2q->data.data;
                        uint32_t durable_v2_timeout = 0;
                        DATA_BLOB create_guid_blob;
+                       const uint8_t *hdr;
+                       uint32_t flags;
 
                        if (dh2q->data.length != 32) {
                                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
@@ -658,15 +804,22 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        create_guid_blob = data_blob_const(p + 16, 16);
 
                        status = GUID_from_ndr_blob(&create_guid_blob,
-                                                   &create_guid);
+                                                   &_create_guid);
                        if (tevent_req_nterror(req, status)) {
                                return tevent_req_post(req, ev);
                        }
+                       create_guid = &_create_guid;
                        /*
                         * we need to store the create_guid later
                         */
                        update_open = true;
 
+                       /*
+                        * And we need to create a cache for replaying the
+                        * create.
+                        */
+                       need_replay_cache = true;
+
                        /*
                         * durable handle v2 request processed below
                         */
@@ -680,77 +833,59 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                 */
                                durable_timeout_msec = (60*1000);
                        }
-               }
-
-               if (dhnc) {
-                       NTTIME now = timeval_to_nttime(&smb2req->request_time);
-                       uint64_t persistent_id;
 
-                       persistent_id = BVAL(dhnc->data.data, 0);
-
-                       status = smb2srv_open_recreate(smb2req->sconn->conn,
-                                               smb1req->conn->session_info,
-                                               persistent_id, create_guid,
-                                               now, &op);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               DEBUG(3, ("smbd_smb2_create_send: "
-                                         "smb2srv_open_recreate v1 failed: %s\n",
-                                         nt_errstr(status)));
-                               tevent_req_nterror(req, status);
+                       /*
+                        * Check for replay operation.
+                        * Only consider it when we have dh2q.
+                        * If we do not have a replay operation, verify that
+                        * the create_guid is not cached for replay.
+                        */
+                       hdr = SMBD_SMB2_IN_HDR_PTR(smb2req);
+                       flags = IVAL(hdr, SMB2_HDR_FLAGS);
+                       replay_operation =
+                               flags & SMB2_HDR_FLAG_REPLAY_OPERATION;
+
+                       status = smb2srv_open_lookup_replay_cache(
+                                       smb2req->xconn, create_guid,
+                                       0 /* now */, &op);
+
+                       if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+                               replay_operation = false;
+                       } else if (tevent_req_nterror(req, status)) {
+                               DBG_WARNING("smb2srv_open_lookup_replay_cache "
+                                           "failed: %s\n", nt_errstr(status));
                                return tevent_req_post(req, ev);
-                       }
-
-                       DEBUG(10, ("smb2_create_send: DHNC: %s recreate the "
-                                  "smb2srv_open struct for a durable handle.\n",
-                                  op->global->durable ? "did" : "could not"));
-
-                       if (!op->global->durable) {
-                               talloc_free(op);
-                               tevent_req_nterror(req,
-                                       NT_STATUS_OBJECT_NAME_NOT_FOUND);
+                       } else if (!replay_operation) {
+                               /*
+                                * If a create without replay operation flag
+                                * is sent but with a create_guid that is
+                                * currently in the replay cache -- fail.
+                                */
+                               status = NT_STATUS_DUPLICATE_OBJECTID;
+                               (void)tevent_req_nterror(req, status);
                                return tevent_req_post(req, ev);
                        }
+               }
+
+               if (dhnc) {
+                       persistent_id = BVAL(dhnc->data.data, 0);
 
                        do_durable_reconnect = true;
                }
 
                if (dh2c) {
                        const uint8_t *p = dh2c->data.data;
-                       NTTIME now = timeval_to_nttime(&smb2req->request_time);
-                       uint64_t persistent_id;
                        DATA_BLOB create_guid_blob;
 
                        persistent_id = BVAL(p, 0);
                        create_guid_blob = data_blob_const(p + 16, 16);
 
                        status = GUID_from_ndr_blob(&create_guid_blob,
-                                                   &create_guid);
+                                                   &_create_guid);
                        if (tevent_req_nterror(req, status)) {
                                return tevent_req_post(req, ev);
                        }
-
-                       status = smb2srv_open_recreate(smb2req->sconn->conn,
-                                                      smb1req->conn->session_info,
-                                                      persistent_id, create_guid,
-                                                      now, &op);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               DEBUG(3, ("smbd_smb2_create_send: "
-                                         "smb2srv_open_recreate v2 failed: %s\n",
-                                         nt_errstr(status)));
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
-                       }
-
-                       DEBUG(10, ("smb2_create_send: DH2C: %s recreate the "
-                                  "smb2srv_open struct for a durable handle.\n",
-                                  op->global->durable ? "did" : "could not"));
-
-                       if (!op->global->durable) {
-                               talloc_free(op);
-                               tevent_req_nterror(req,
-                                       NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                               return tevent_req_post(req, ev);
-                       }
+                       create_guid = &_create_guid;
 
                        do_durable_reconnect = true;
                }
@@ -779,14 +914,14 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 
                        TALLOC_FREE(fname);
                        fname = talloc_asprintf(state,
-                                       "@GMT-%04u.%02u.%02u-%02u.%02u.%02u\\%s",
+                                       "%s\\@GMT-%04u.%02u.%02u-%02u.%02u.%02u",
+                                       in_name,
                                        tm->tm_year + 1900,
                                        tm->tm_mon + 1,
                                        tm->tm_mday,
                                        tm->tm_hour,
                                        tm->tm_min,
-                                       tm->tm_sec,
-                                       in_name);
+                                       tm->tm_sec);
                        if (tevent_req_nomem(fname, req)) {
                                return tevent_req_post(req, ev);
                        }
@@ -799,6 +934,60 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        }
                }
 
+               if (rqls) {
+                       lease_len = smb2_lease_pull(
+                               rqls->data.data, rqls->data.length, &lease);
+                       if (lease_len == -1) {
+                               tevent_req_nterror(
+                                       req, NT_STATUS_INVALID_PARAMETER);
+                               return tevent_req_post(req, ev);
+                       }
+                       lease_ptr = &lease;
+
+                       if (DEBUGLEVEL >= 10) {
+                               DEBUG(10, ("Got lease request size %d\n",
+                                          (int)lease_len));
+                               NDR_PRINT_DEBUG(smb2_lease, lease_ptr);
+                       }
+
+                       if (!smb2_lease_key_valid(&lease.lease_key)) {
+                               lease_ptr = NULL;
+                               requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+                       }
+
+                       if ((smb2req->xconn->protocol < PROTOCOL_SMB3_00) &&
+                           (lease.lease_version != 1)) {
+                               DEBUG(10, ("v2 lease key only for SMB3\n"));
+                               lease_ptr = NULL;
+                       }
+
+                       /*
+                        * Replay with a lease is only allowed if the
+                        * established open carries a lease with the
+                        * same lease key.
+                        */
+                       if (replay_operation) {
+                               struct smb2_lease *op_ls =
+                                               &op->compat->lease->lease;
+                               int op_oplock = op->compat->oplock_type;
+
+                               if (map_samba_oplock_levels_to_smb2(op_oplock)
+                                   != SMB2_OPLOCK_LEVEL_LEASE)
+                               {
+                                       status = NT_STATUS_ACCESS_DENIED;
+                                       (void)tevent_req_nterror(req, status);
+                                       return tevent_req_post(req, ev);
+                               }
+                               if (!smb2_lease_key_equal(&lease.lease_key,
+                                                         &op_ls->lease_key))
+                               {
+                                       status = NT_STATUS_ACCESS_DENIED;
+                                       (void)tevent_req_nterror(req, status);
+                                       return tevent_req_post(req, ev);
+                               }
+                       }
+               }
+
                /* these are ignored for SMB2 */
                in_create_options &= ~(0x10);/* NTCREATEX_OPTIONS_SYNC_ALERT */
                in_create_options &= ~(0x20);/* NTCREATEX_OPTIONS_ASYNC_ALERT */
@@ -809,16 +998,48 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 
                /*
                 * For the backend file open procedure, there are
-                * two possible modes: durable_reconnect or not.
+                * three possible modes: replay operation (in which case
+                * there is nothing else to do), durable_reconnect or
+                * new open.
                 */
-               if (do_durable_reconnect) {
+               if (replay_operation) {
+                       result = op->compat;
+                       result->op = op;
+                       update_open = false;
+                       info = op->create_action;
+               } else if (do_durable_reconnect) {
                        DATA_BLOB new_cookie = data_blob_null;
+                       NTTIME now = timeval_to_nttime(&smb2req->request_time);
+
+                       status = smb2srv_open_recreate(smb2req->xconn,
+                                               smb1req->conn->session_info,
+                                               persistent_id, create_guid,
+                                               now, &op);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               DEBUG(3, ("smbd_smb2_create_send: "
+                                         "smb2srv_open_recreate failed: %s\n",
+                                         nt_errstr(status)));
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+
+                       DEBUG(10, ("smb2_create_send: %s to recreate the "
+                                  "smb2srv_open struct for a durable handle.\n",
+                                  op->global->durable ? "succeeded" : "failed"));
+
+                       if (!op->global->durable) {
+                               talloc_free(op);
+                               tevent_req_nterror(req,
+                                       NT_STATUS_OBJECT_NAME_NOT_FOUND);
+                               return tevent_req_post(req, ev);
+                       }
 
                        status = SMB_VFS_DURABLE_RECONNECT(smb1req->conn,
                                                smb1req,
-                                               op,
+                                               op, /* smbXsrv_open input */
                                                op->global->backend_cookie,
-                                               op, &result, &new_cookie);
+                                               op, /* TALLOC_CTX */
+                                               &result, &new_cookie);
                        if (!NT_STATUS_IS_OK(status)) {
                                NTSTATUS return_status;
 
@@ -833,6 +1054,17 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                return tevent_req_post(req, ev);
                        }
 
+                       DEBUG(10, ("result->oplock_type=%u, lease_ptr==%p\n",
+                                  (unsigned)result->oplock_type, lease_ptr));
+
+                       status = smbd_smb2_create_durable_lease_check(
+                               smb1req, fname, result, lease_ptr);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               close_file(smb1req, result, SHUTDOWN_CLOSE);
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+
                        data_blob_free(&op->global->backend_cookie);
                        op->global->backend_cookie = new_cookie;
 
@@ -847,6 +1079,15 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        info = FILE_WAS_OPENED;
                } else {
                        struct smb_filename *smb_fname = NULL;
+                       uint32_t ucf_flags;
+
+                       if (requested_oplock_level == SMB2_OPLOCK_LEVEL_LEASE) {
+                               if (lease_ptr == NULL) {
+                                       requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+                               }
+                       } else {
+                               lease_ptr = NULL;
+                       }
 
                        /*
                         * For a DFS path the function parse_dfs_path()
@@ -862,11 +1103,12 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                }
                        }
 
+                       ucf_flags = filename_create_ucf_flags(smb1req, in_create_disposition);
                        status = filename_convert(req,
                                                  smb1req->conn,
                                                  smb1req->flags2 & FLAGS2_DFS_PATHNAMES,
                                                  fname,
-                                                 0,    /* unix_convert flags */
+                                                 ucf_flags,
                                                  NULL, /* ppath_contains_wcards */
                                                  &smb_fname);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -874,6 +1116,40 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                return tevent_req_post(req, ev);
                        }
 
+                       /*
+                        * MS-SMB2: 2.2.13 SMB2 CREATE Request
+                        * ImpersonationLevel ... MUST contain one of the
+                        * following values. The server MUST validate this
+                        * field, but otherwise ignore it.
+                        *
+                        * NB. The source4/torture/smb2/durable_open.c test
+                        * shows this check is only done on real opens, not
+                        * on durable handle-reopens.
+                        */
+
+                       if (in_impersonation_level >
+                                       SMB2_IMPERSONATION_DELEGATE) {
+                               tevent_req_nterror(req,
+                                       NT_STATUS_BAD_IMPERSONATION_LEVEL);
+                               return tevent_req_post(req, ev);
+                       }
+
+                       /*
+                        * We know we're going to do a local open, so now
+                        * we must be protocol strict. JRA.
+                        *
+                        * MS-SMB2: 3.3.5.9 - Receiving an SMB2 CREATE Request
+                        * If the file name length is greater than zero and the
+                        * first character is a path separator character, the
+                        * server MUST fail the request with
+                        * STATUS_INVALID_PARAMETER.
+                        */
+                       if (in_name[0] == '\\' || in_name[0] == '/') {
+                               tevent_req_nterror(req,
+                                       NT_STATUS_INVALID_PARAMETER);
+                               return tevent_req_post(req, ev);
+                       }
+
                        status = SMB_VFS_CREATE_FILE(smb1req->conn,
                                                     smb1req,
                                                     0, /* root_dir_fid */
@@ -884,14 +1160,18 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                                     in_create_options,
                                                     in_file_attributes,
                                                     map_smb2_oplock_levels_to_samba(requested_oplock_level),
+                                                    lease_ptr,
                                                     allocation_size,
                                                     0, /* private_flags */
                                                     sec_desc,
                                                     ea_list,
                                                     &result,
-                                                    &info);
+                                                    &info,
+                                                    &in_context_blobs,
+                                                    state->out_context_blobs);
                        if (!NT_STATUS_IS_OK(status)) {
-                               if (open_was_deferred(smb1req->sconn, smb1req->mid)) {
+                               if (open_was_deferred(smb1req->xconn, smb1req->mid)) {
+                                       SMBPROFILE_IOBYTES_ASYNC_SET_IDLE(smb2req->profile);
                                        return req;
                                }
                                tevent_req_nterror(req, status);
@@ -910,7 +1190,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                if (mxac) {
                        NTTIME last_write_time;
 
-                       unix_timespec_to_nt_time(&last_write_time,
+                       last_write_time = unix_timespec_to_nt_time(
                                                 result->fsp_name->st.st_ex_mtime);
                        if (last_write_time != max_access_time) {
                                uint8_t p[8];
@@ -926,10 +1206,11 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                SIVAL(p, 0, NT_STATUS_V(status));
                                SIVAL(p, 4, max_access_granted);
 
-                               status = smb2_create_blob_add(state,
-                                                       &out_context_blobs,
-                                                       SMB2_CREATE_TAG_MXAC,
-                                                       blob);
+                               status = smb2_create_blob_add(
+                                   state->out_context_blobs,
+                                   state->out_context_blobs,
+                                   SMB2_CREATE_TAG_MXAC,
+                                   blob);
                                if (!NT_STATUS_IS_OK(status)) {
                                        tevent_req_nterror(req, status);
                                        return tevent_req_post(req, ev);
@@ -937,8 +1218,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        }
                }
 
-               if (durable_requested &&
-                   BATCH_OPLOCK_TYPE(result->oplock_type))
+               if (!replay_operation && durable_requested &&
+                   (fsp_lease_type(result) & SMB2_LEASE_HANDLE))
                {
                        status = SMB_VFS_DURABLE_COOKIE(result,
                                                op,
@@ -947,7 +1228,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                op->global->backend_cookie = data_blob_null;
                        }
                }
-               if (op->global->backend_cookie.length > 0) {
+               if (!replay_operation && op->global->backend_cookie.length > 0)
+               {
                        update_open = true;
 
                        op->global->durable = true;
@@ -955,7 +1237,10 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                }
 
                if (update_open) {
-                       op->global->create_guid = create_guid;
+                       op->global->create_guid = _create_guid;
+                       if (need_replay_cache) {
+                               op->flags |= SMBXSRV_OPEN_NEED_REPLAY_CACHE;
+                       }
 
                        status = smbXsrv_open_update(op);
                        DEBUG(10, ("smb2_create_send: smbXsrv_open_update "
@@ -971,8 +1256,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        uint8_t p[8] = { 0, };
                        DATA_BLOB blob = data_blob_const(p, sizeof(p));
 
-                       status = smb2_create_blob_add(state,
-                                                     &out_context_blobs,
+                       status = smb2_create_blob_add(state->out_context_blobs,
+                                                     state->out_context_blobs,
                                                      SMB2_CREATE_TAG_DHNQ,
                                                      blob);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -981,7 +1266,18 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        }
                }
 
-               if (dh2q && op->global->durable) {
+               if (dh2q && op->global->durable &&
+                   /*
+                    * For replay operations, we return the dh2q blob
+                    * in the case of oplocks not based on the state of
+                    * the open, but on whether it could have been granted
+                    * for the request data. In the case of leases instead,
+                    * the state of the open is used...
+                    */
+                   (!replay_operation ||
+                    in_oplock_level == SMB2_OPLOCK_LEVEL_BATCH ||
+                    in_oplock_level == SMB2_OPLOCK_LEVEL_LEASE))
+               {
                        uint8_t p[8] = { 0, };
                        DATA_BLOB blob = data_blob_const(p, sizeof(p));
                        uint32_t durable_v2_response_flags = 0;
@@ -989,7 +1285,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        SIVAL(p, 0, op->global->durable_timeout_msec);
                        SIVAL(p, 4, durable_v2_response_flags);
 
-                       status = smb2_create_blob_add(state, &out_context_blobs,
+                       status = smb2_create_blob_add(state->out_context_blobs,
+                                                     state->out_context_blobs,
                                                      SMB2_CREATE_TAG_DH2Q,
                                                      blob);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -1013,7 +1310,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        SBVAL(p, 0, file_index);
                        SIVAL(p, 8, result->fsp_name->st.st_ex_dev);/* FileIndexHigh */
 
-                       status = smb2_create_blob_add(state, &out_context_blobs,
+                       status = smb2_create_blob_add(state->out_context_blobs,
+                                                     state->out_context_blobs,
                                                      SMB2_CREATE_TAG_QFID,
                                                      blob);
                        if (!NT_STATUS_IS_OK(status)) {
@@ -1021,11 +1319,39 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                return tevent_req_post(req, ev);
                        }
                }
+
+               if ((rqls != NULL) && (result->oplock_type == LEASE_OPLOCK)) {
+                       uint8_t buf[52];
+
+                       lease = result->lease->lease;
+
+                       lease_len = sizeof(buf);
+                       if (lease.lease_version == 1) {
+                               lease_len = 32;
+                       }
+
+                       if (!smb2_lease_push(&lease, buf, lease_len)) {
+                               tevent_req_nterror(
+                                       req, NT_STATUS_INTERNAL_ERROR);
+                               return tevent_req_post(req, ev);
+                       }
+
+                       status = smb2_create_blob_add(
+                               state, state->out_context_blobs,
+                               SMB2_CREATE_TAG_RQLS,
+                               data_blob_const(buf, lease_len));
+                       if (!NT_STATUS_IS_OK(status)) {
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+               }
        }
 
        smb2req->compat_chain_fsp = smb1req->chain_fsp;
 
-       if(lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
+       if (replay_operation) {
+               state->out_oplock_level = in_oplock_level;
+       } else if (lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
                state->out_oplock_level = in_oplock_level;
        } else {
                state->out_oplock_level = map_samba_oplock_levels_to_smb2(result->oplock_type);
@@ -1037,26 +1363,24 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
        } else {
                state->out_create_action = info;
        }
+       result->op->create_action = state->out_create_action;
        state->out_file_attributes = dos_mode(result->conn,
                                           result->fsp_name);
-       /* Deal with other possible opens having a modified
-          write time. JRA. */
-       ZERO_STRUCT(write_time_ts);
-       get_file_infos(result->file_id, 0, NULL, &write_time_ts);
-       if (!null_timespec(write_time_ts)) {
-               update_stat_ex_mtime(&result->fsp_name->st, write_time_ts);
-       }
-
-       unix_timespec_to_nt_time(&state->out_creation_time,
-                       get_create_timespec(smb1req->conn, result,
-                                       result->fsp_name));
-       unix_timespec_to_nt_time(&state->out_last_access_time,
-                       result->fsp_name->st.st_ex_atime);
-       unix_timespec_to_nt_time(&state->out_last_write_time,
-                       result->fsp_name->st.st_ex_mtime);
-       unix_timespec_to_nt_time(&state->out_change_time,
-                       get_change_timespec(smb1req->conn, result,
-                                       result->fsp_name));
+
+       state->out_creation_ts = get_create_timespec(smb1req->conn,
+                                       result, result->fsp_name);
+       state->out_last_access_ts = result->fsp_name->st.st_ex_atime;
+       state->out_last_write_ts = result->fsp_name->st.st_ex_mtime;
+       state->out_change_ts = get_change_timespec(smb1req->conn,
+                                       result, result->fsp_name);
+
+       if (lp_dos_filetime_resolution(SNUM(smb2req->tcon->compat))) {
+               dos_filetime_timespec(&state->out_creation_ts);
+               dos_filetime_timespec(&state->out_last_access_ts);
+               dos_filetime_timespec(&state->out_last_write_ts);
+               dos_filetime_timespec(&state->out_change_ts);
+       }
+
        state->out_allocation_size =
                        SMB_VFS_GET_ALLOC_SIZE(smb1req->conn, result,
                                               &(result->fsp_name->st));
@@ -1066,7 +1390,6 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
        }
        state->out_file_id_persistent = result->op->global->open_persistent_id;
        state->out_file_id_volatile = result->op->global->open_volatile_id;
-       state->out_context_blobs = out_context_blobs;
 
        DEBUG(10,("smbd_smb2_create_send: %s - %s\n",
                  fsp_str_dbg(result), fsp_fnum_dbg(result)));
@@ -1079,10 +1402,10 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req,
                        TALLOC_CTX *mem_ctx,
                        uint8_t *out_oplock_level,
                        uint32_t *out_create_action,
-                       NTTIME *out_creation_time,
-                       NTTIME *out_last_access_time,
-                       NTTIME *out_last_write_time,
-                       NTTIME *out_change_time,
+                       struct timespec *out_creation_ts,
+                       struct timespec *out_last_access_ts,
+                       struct timespec *out_last_write_ts,
+                       struct timespec *out_change_ts,
                        uint64_t *out_allocation_size,
                        uint64_t *out_end_of_file,
                        uint32_t *out_file_attributes,
@@ -1101,18 +1424,18 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req,
 
        *out_oplock_level       = state->out_oplock_level;
        *out_create_action      = state->out_create_action;
-       *out_creation_time      = state->out_creation_time;
-       *out_last_access_time   = state->out_last_access_time;
-       *out_last_write_time    = state->out_last_write_time;
-       *out_change_time        = state->out_change_time;
+       *out_creation_ts        = state->out_creation_ts;
+       *out_last_access_ts     = state->out_last_access_ts;
+       *out_last_write_ts      = state->out_last_write_ts;
+       *out_change_ts          = state->out_change_ts;
        *out_allocation_size    = state->out_allocation_size;
        *out_end_of_file        = state->out_end_of_file;
        *out_file_attributes    = state->out_file_attributes;
        *out_file_id_persistent = state->out_file_id_persistent;
        *out_file_id_volatile   = state->out_file_id_volatile;
-       *out_context_blobs      = state->out_context_blobs;
+       *out_context_blobs      = *(state->out_context_blobs);
 
-       talloc_steal(mem_ctx, state->out_context_blobs.blobs);
+       talloc_steal(mem_ctx, state->out_context_blobs->blobs);
 
        tevent_req_received(req);
        return NT_STATUS_OK;
@@ -1124,7 +1447,7 @@ static NTSTATUS smbd_smb2_create_recv(struct tevent_req *req,
 
 bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
                        struct timeval *p_request_time,
-                       void **pp_state)
+                       struct deferred_open_record **open_rec)
 {
        struct smbd_smb2_create_state *state = NULL;
        struct tevent_req *req = NULL;
@@ -1146,8 +1469,8 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
        if (p_request_time) {
                *p_request_time = state->request_time;
        }
-       if (pp_state) {
-               *pp_state = (void *)state->private_data.data;
+       if (open_rec != NULL) {
+               *open_rec = state->open_rec;
        }
        return true;
 }
@@ -1158,11 +1481,11 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
 *********************************************************/
 
 static struct smbd_smb2_request *find_open_smb2req(
-       struct smbd_server_connection *sconn, uint64_t mid)
+       struct smbXsrv_connection *xconn, uint64_t mid)
 {
        struct smbd_smb2_request *smb2req;
 
-       for (smb2req = sconn->smb2.requests; smb2req; smb2req = smb2req->next) {
+       for (smb2req = xconn->smb2.requests; smb2req; smb2req = smb2req->next) {
                uint64_t message_id;
                if (smb2req->subreq == NULL) {
                        /* This message has been processed. */
@@ -1180,12 +1503,12 @@ static struct smbd_smb2_request *find_open_smb2req(
        return NULL;
 }
 
-bool open_was_deferred_smb2(struct smbd_server_connection *sconn, uint64_t mid)
+bool open_was_deferred_smb2(struct smbXsrv_connection *xconn, uint64_t mid)
 {
        struct smbd_smb2_create_state *state = NULL;
        struct smbd_smb2_request *smb2req;
 
-       smb2req = find_open_smb2req(sconn, mid);
+       smb2req = find_open_smb2req(xconn, mid);
 
        if (!smb2req) {
                DEBUG(10,("open_was_deferred_smb2: mid %llu smb2req == NULL\n",
@@ -1243,11 +1566,11 @@ static void remove_deferred_open_message_smb2_internal(struct smbd_smb2_request
 }
 
 void remove_deferred_open_message_smb2(
-       struct smbd_server_connection *sconn, uint64_t mid)
+       struct smbXsrv_connection *xconn, uint64_t mid)
 {
        struct smbd_smb2_request *smb2req;
 
-       smb2req = find_open_smb2req(sconn, mid);
+       smb2req = find_open_smb2req(xconn, mid);
 
        if (!smb2req) {
                DEBUG(10,("remove_deferred_open_message_smb2: "
@@ -1264,7 +1587,6 @@ static void smbd_smb2_create_request_dispatch_immediate(struct tevent_context *c
 {
        struct smbd_smb2_request *smb2req = talloc_get_type_abort(private_data,
                                        struct smbd_smb2_request);
-       struct smbd_server_connection *sconn = smb2req->sconn;
        uint64_t mid = get_mid_from_smb2req(smb2req);
        NTSTATUS status;
 
@@ -1274,18 +1596,19 @@ static void smbd_smb2_create_request_dispatch_immediate(struct tevent_context *c
 
        status = smbd_smb2_request_dispatch(smb2req);
        if (!NT_STATUS_IS_OK(status)) {
-               smbd_server_connection_terminate(sconn, nt_errstr(status));
+               smbd_server_connection_terminate(smb2req->xconn,
+                                                nt_errstr(status));
                return;
        }
 }
 
 bool schedule_deferred_open_message_smb2(
-       struct smbd_server_connection *sconn, uint64_t mid)
+       struct smbXsrv_connection *xconn, uint64_t mid)
 {
        struct smbd_smb2_create_state *state = NULL;
        struct smbd_smb2_request *smb2req;
 
-       smb2req = find_open_smb2req(sconn, mid);
+       smb2req = find_open_smb2req(xconn, mid);
 
        if (!smb2req) {
                DEBUG(10,("schedule_deferred_open_message_smb2: "
@@ -1321,7 +1644,7 @@ bool schedule_deferred_open_message_smb2(
 
        state->im = tevent_create_immediate(smb2req);
        if (!state->im) {
-               smbd_server_connection_terminate(smb2req->sconn,
+               smbd_server_connection_terminate(smb2req->xconn,
                        nt_errstr(NT_STATUS_NO_MEMORY));
                return false;
        }
@@ -1356,13 +1679,11 @@ static bool smbd_smb2_create_cancel(struct tevent_req *req)
        smb2req = state->smb2req;
        mid = get_mid_from_smb2req(smb2req);
 
-       if (is_deferred_open_async(state->private_data.data)) {
+       if (is_deferred_open_async(state->open_rec)) {
                /* Can't cancel an async create. */
                return false;
        }
 
-       remove_deferred_open_entry(state->id, mid,
-                                  messaging_server_id(smb2req->sconn->msg_ctx));
        remove_deferred_open_message_smb2_internal(smb2req, mid);
 
        tevent_req_defer_callback(req, smb2req->sconn->ev_ctx);
@@ -1374,8 +1695,7 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
                                 struct timeval request_time,
                                 struct timeval timeout,
                                struct file_id id,
-                                char *private_data,
-                                size_t priv_len)
+                               struct deferred_open_record *open_rec)
 {
        struct tevent_req *req = NULL;
        struct smbd_smb2_create_state *state = NULL;
@@ -1394,11 +1714,7 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
        }
        state->id = id;
        state->request_time = request_time;
-       state->private_data = data_blob_talloc(state, private_data,
-                                               priv_len);
-       if (!state->private_data.data) {
-               return false;
-       }
+       state->open_rec = talloc_move(state, &open_rec);
 
        /* Re-schedule us to retry on timer expiry. */
        end_time = timeval_sum(&request_time, &timeout);