smbd: Add "hide new files" option
[samba.git] / source3 / smbd / smb2_create.c
index 99a5b38ed64cfe83b46f9998828a81114b1e40d3..7f80f6f8138cdee1bdfa9a655a2e470bdad1dfe2 100644 (file)
 #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"
 
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_SMB2
+
 int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
 {
        switch(in_oplock_level) {
@@ -40,9 +44,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 +60,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 +84,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,
@@ -229,7 +228,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
        }
 
        tsubreq = smbd_smb2_create_send(smb2req,
-                                      smb2req->sconn->ev_ctx,
+                                      smb2req->ev_ctx,
                                       smb2req,
                                       in_oplock_level,
                                       in_impersonation_level,
@@ -246,13 +245,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 +262,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 +282,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 +295,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 +306,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 +317,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 +334,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,122 +366,178 @@ 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)
+{
+       char *filename = NULL;
+       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;
+       }
+
+       filename = talloc_strdup(talloc_tos(), requested_filename);
+       if (filename == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       /* This also converts '\' to '/' */
+       status = check_path_syntax(filename);
+       if (!NT_STATUS_IS_OK(status)) {
+               TALLOC_FREE(filename);
+               return status;
+       }
+
+       ucf_flags = filename_create_ucf_flags(smb1req, FILE_OPEN);
+       status = filename_convert(talloc_tos(), fsp->conn,
+                                 filename, ucf_flags,
+                                 NULL, &smb_fname);
+       TALLOC_FREE(filename);
+       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 tevent_context *ev;
        struct smbd_smb2_request *smb2req;
        struct smb_request *smb1req;
        bool open_was_deferred;
-       struct tevent_timer *te;
        struct tevent_immediate *im;
        struct timeval request_time;
        struct file_id id;
-       DATA_BLOB private_data;
+       struct deferred_open_record *open_rec;
+       files_struct *result;
+       bool replay_operation;
+       uint8_t in_oplock_level;
+       uint32_t in_create_disposition;
+       int requested_oplock_level;
+       int info;
+       char *fname;
+       struct ea_list *ea_list;
+       NTTIME max_access_time;
+       struct security_descriptor *sec_desc;
+       uint64_t allocation_size;
+       struct GUID _create_guid;
+       struct GUID *create_guid;
+       bool update_open;
+       bool durable_requested;
+       uint32_t durable_timeout_msec;
+       bool do_durable_reconnect;
+       uint64_t persistent_id;
+       struct smb2_lease lease;
+       struct smb2_lease *lease_ptr;
+       ssize_t lease_len;
+       bool need_replay_cache;
+       struct smbXsrv_open *op;
+
+       struct smb2_create_blob *dhnc;
+       struct smb2_create_blob *dh2c;
+       struct smb2_create_blob *dhnq;
+       struct smb2_create_blob *dh2q;
+       struct smb2_create_blob *rqls;
+       struct smb2_create_blob *exta;
+       struct smb2_create_blob *mxac;
+       struct smb2_create_blob *secd;
+       struct smb2_create_blob *alsi;
+       struct smb2_create_blob *twrp;
+       struct smb2_create_blob *qfid;
+       struct smb2_create_blob *svhdx;
+
        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,
-                       struct tevent_context *ev,
-                       struct smbd_smb2_request *smb2req,
-                       uint8_t in_oplock_level,
-                       uint32_t in_impersonation_level,
-                       uint32_t in_desired_access,
-                       uint32_t in_file_attributes,
-                       uint32_t in_share_access,
-                       uint32_t in_create_disposition,
-                       uint32_t in_create_options,
-                       const char *in_name,
-                       struct smb2_create_blobs in_context_blobs)
+static NTSTATUS smbd_smb2_create_fetch_create_ctx(
+       struct tevent_req *req,
+       struct smb2_create_blobs *in_context_blobs)
 {
-       struct tevent_req *req = NULL;
-       struct smbd_smb2_create_state *state = NULL;
-       NTSTATUS status;
-       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 smb2_create_blob *dhnq = NULL;
-       struct smb2_create_blob *dh2q = NULL;
-       struct smbXsrv_open *op = NULL;
-
-       ZERO_STRUCT(out_context_blobs);
-
-       if(lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
-               requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
-       } else {
-               requested_oplock_level = in_oplock_level;
+       struct smbd_smb2_create_state *state = tevent_req_data(
+               req, struct smbd_smb2_create_state);
+
+       state->dhnq = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_DHNQ);
+       state->dhnc = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_DHNC);
+       state->dh2q = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_DH2Q);
+       state->dh2c = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_DH2C);
+       if (state->smb2req->xconn->smb2.server.capabilities & SMB2_CAP_LEASING) {
+               state->rqls = smb2_create_blob_find(in_context_blobs,
+                                                   SMB2_CREATE_TAG_RQLS);
        }
 
-
-       if (smb2req->subreq == NULL) {
-               /* New create call. */
-               req = tevent_req_create(mem_ctx, &state,
-                               struct smbd_smb2_create_state);
-               if (req == NULL) {
-                       return NULL;
-               }
-               state->smb2req = smb2req;
-
-               smb1req = smbd_smb2_fake_smb_request(smb2req);
-               if (tevent_req_nomem(smb1req, req)) {
-                       return tevent_req_post(req, ev);
-               }
-               state->smb1req = smb1req;
-               smb2req->subreq = req;
-               DEBUG(10,("smbd_smb2_create: name[%s]\n",
-                       in_name));
-       } else {
-               /* Re-entrant create call. */
-               req = smb2req->subreq;
-               state = tevent_req_data(req,
-                               struct smbd_smb2_create_state);
-               smb1req = state->smb1req;
-               DEBUG(10,("smbd_smb2_create_send: reentrant for file %s\n",
-                       in_name ));
-       }
-
-       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 ((dhnc && dh2c) || (dhnc && dh2q) || (dh2c && dhnq) ||
-           (dh2q && dh2c))
+       if (((state->dhnc != NULL) && (state->dh2c != NULL)) ||
+           ((state->dhnc != NULL) && (state->dh2q != NULL)) ||
+           ((state->dh2c != NULL) && (state->dhnq != NULL)) ||
+           ((state->dh2q != NULL) && (state->dh2c != NULL)))
        {
                /* not both are allowed at the same time */
-               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-               return tevent_req_post(req, ev);
+               return NT_STATUS_INVALID_PARAMETER;
        }
 
-       if (dhnc) {
+       if (state->dhnc != NULL) {
                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 (state->dhnc->data.length != 16) {
+                       return NT_STATUS_INVALID_PARAMETER;
                }
 
                /*
@@ -496,583 +550,964 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                 * (Note that the cases of an additional dh2q or dh2c blob
                 *  which require a different error code, have been treated
                 *  above.)
-                *
-                * TODO:
-                * This is only true for the oplock case:
-                * For leases, lease request is required additionally.
                 */
 
-               if (dhnq) {
+               if (state->dhnq != NULL) {
                        num_blobs_allowed = 2;
                } else {
                        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);
+               if (state->rqls != NULL) {
+                       num_blobs_allowed += 1;
+               }
+
+               if (in_context_blobs->num_blobs != num_blobs_allowed) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                }
        }
 
-       if (dh2c) {
-               if (dh2c->data.length != 36) {
-                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                       return tevent_req_post(req, ev);
+       if (state->dh2c!= NULL) {
+               uint32_t num_blobs_allowed;
+
+               if (state->dh2c->data.length != 36) {
+                       return NT_STATUS_INVALID_PARAMETER;
                }
-               if (in_context_blobs.num_blobs != 1) {
-                       /*
-                        * DH2C should be the only one.
-                        * TODO: This is only true for the oplock case!
-                        * For leases, lease request is required additionally!
-                        */
-                       tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                       return tevent_req_post(req, ev);
+
+               /*
+                * 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 (state->rqls != NULL) {
+                       num_blobs_allowed += 1;
+               }
+
+               if (in_context_blobs->num_blobs != num_blobs_allowed) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
                }
        }
 
+       state->exta = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_EXTA);
+       state->mxac = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_MXAC);
+       state->secd = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_SECD);
+       state->alsi = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_ALSI);
+       state->twrp = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_TWRP);
+       state->qfid = smb2_create_blob_find(in_context_blobs,
+                                           SMB2_CREATE_TAG_QFID);
+       if (state->smb2req->xconn->protocol >= PROTOCOL_SMB3_02) {
+               /*
+                * This was introduced with SMB3_02
+                */
+               state->svhdx = smb2_create_blob_find(
+                       in_context_blobs, SVHDX_OPEN_DEVICE_CONTEXT);
+       }
+
+       return NT_STATUS_OK;
+}
+
+static void smbd_smb2_create_before_exec(struct tevent_req *req);
+static void smbd_smb2_create_after_exec(struct tevent_req *req);
+static void smbd_smb2_create_finish(struct tevent_req *req);
+
+static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
+                       struct tevent_context *ev,
+                       struct smbd_smb2_request *smb2req,
+                       uint8_t in_oplock_level,
+                       uint32_t in_impersonation_level,
+                       uint32_t in_desired_access,
+                       uint32_t in_file_attributes,
+                       uint32_t in_share_access,
+                       uint32_t in_create_disposition,
+                       uint32_t in_create_options,
+                       const char *in_name,
+                       struct smb2_create_blobs in_context_blobs)
+{
+       struct tevent_req *req = NULL;
+       struct smbd_smb2_create_state *state = NULL;
+       NTSTATUS status;
+       struct smb_request *smb1req = NULL;
+       struct smb_filename *smb_fname = NULL;
+       uint32_t ucf_flags;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct smbd_smb2_create_state);
+       if (req == NULL) {
+               return NULL;
+       }
+       *state = (struct smbd_smb2_create_state) {
+               .ev = ev,
+               .smb2req = smb2req,
+               .in_oplock_level = in_oplock_level,
+               .in_create_disposition = in_create_disposition,
+       };
+
+       smb1req = smbd_smb2_fake_smb_request(smb2req);
+       if (tevent_req_nomem(smb1req, req)) {
+               return tevent_req_post(req, state->ev);
+       }
+       state->smb1req = smb1req;
+
+       if (smb2req->subreq == NULL) {
+               DBG_DEBUG("name [%s]\n", in_name);
+       } else {
+               struct smbd_smb2_create_state *old_state = tevent_req_data(
+                       smb2req->subreq, struct smbd_smb2_create_state);
+
+               DBG_DEBUG("reentrant for file %s\n", in_name);
+
+               state->id = old_state->id;
+               state->request_time = old_state->request_time;
+               state->open_rec = talloc_move(state, &old_state->open_rec);
+               state->open_was_deferred = old_state->open_was_deferred;
+       }
+
+       TALLOC_FREE(smb2req->subreq);
+       smb2req->subreq = req;
+
+       if (lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
+               state->requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+       } else {
+               state->requested_oplock_level = state->in_oplock_level;
+       }
+
+       /* these are ignored for SMB2 */
+       in_create_options &= ~(0x10);/* NTCREATEX_OPTIONS_SYNC_ALERT */
+       in_create_options &= ~(0x20);/* NTCREATEX_OPTIONS_ASYNC_ALERT */
+
+       in_file_attributes &= ~FILE_FLAG_POSIX_SEMANTICS;
+
+       state->fname = talloc_strdup(state, in_name);
+       if (tevent_req_nomem(state->fname, req)) {
+               return tevent_req_post(req, state->ev);
+       }
+
+       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, state->ev);
+       }
+
+       status = smbd_smb2_create_fetch_create_ctx(req, &in_context_blobs);
+       if (tevent_req_nterror(req, status)) {
+               return tevent_req_post(req, state->ev);
+       }
+
        if (IS_IPC(smb1req->conn)) {
                const char *pipe_name = in_name;
 
-               if (dhnc || dh2c) {
+               if (state->dhnc != NULL || state->dh2c != NULL) {
                        /* durable handles are not supported on IPC$ */
                        tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                       return tevent_req_post(req, ev);
+                       return tevent_req_post(req, state->ev);
                }
 
                if (!lp_nt_pipe_support()) {
                        tevent_req_nterror(req, NT_STATUS_ACCESS_DENIED);
-                       return tevent_req_post(req, ev);
+                       return tevent_req_post(req, state->ev);
                }
 
-               status = open_np_file(smb1req, pipe_name, &result);
+               status = open_np_file(smb1req, pipe_name, &state->result);
                if (!NT_STATUS_IS_OK(status)) {
                        tevent_req_nterror(req, status);
-                       return tevent_req_post(req, ev);
+                       return tevent_req_post(req, state->ev);
                }
-               info = FILE_WAS_OPENED;
+               state->info = FILE_WAS_OPENED;
+
+               smbd_smb2_create_finish(req);
+               return req;
+
        } else if (CAN_PRINT(smb1req->conn)) {
-               if (dhnc || dh2c) {
+               if (state->dhnc != NULL || state->dh2c != NULL) {
                        /* durable handles are not supported on printers */
                        tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                       return tevent_req_post(req, ev);
+                       return tevent_req_post(req, state->ev);
                }
 
-               status = file_new(smb1req, smb1req->conn, &result);
+               status = file_new(smb1req, smb1req->conn, &state->result);
                if(!NT_STATUS_IS_OK(status)) {
                        tevent_req_nterror(req, status);
-                       return tevent_req_post(req, ev);
+                       return tevent_req_post(req, state->ev);
                }
 
-               status = print_spool_open(result, in_name,
+               status = print_spool_open(state->result, in_name,
                                          smb1req->vuid);
                if (!NT_STATUS_IS_OK(status)) {
-                       file_free(smb1req, result);
+                       file_free(smb1req, state->result);
                        tevent_req_nterror(req, status);
-                       return tevent_req_post(req, ev);
+                       return tevent_req_post(req, state->ev);
                }
-               info = FILE_WAS_CREATED;
-       } else {
-               char *fname;
-               struct smb2_create_blob *exta = NULL;
-               struct ea_list *ea_list = NULL;
-               struct smb2_create_blob *mxac = NULL;
-               NTTIME max_access_time = 0;
-               struct smb2_create_blob *secd = NULL;
-               struct security_descriptor *sec_desc = 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 = NULL;
-               bool update_open = false;
-               bool durable_requested = false;
-               uint32_t durable_timeout_msec = 0;
-               bool do_durable_reconnect = false;
-               uint64_t persistent_id = 0;
-
-               exta = smb2_create_blob_find(&in_context_blobs,
-                                            SMB2_CREATE_TAG_EXTA);
-               mxac = smb2_create_blob_find(&in_context_blobs,
-                                            SMB2_CREATE_TAG_MXAC);
-               secd = smb2_create_blob_find(&in_context_blobs,
-                                            SMB2_CREATE_TAG_SECD);
-               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);
-
-               fname = talloc_strdup(state, in_name);
-               if (tevent_req_nomem(fname, req)) {
-                       return tevent_req_post(req, ev);
+               state->info = FILE_WAS_CREATED;
+
+               smbd_smb2_create_finish(req);
+               return req;
+       }
+
+       smbd_smb2_create_before_exec(req);
+       if (!tevent_req_is_in_progress(req)) {
+               return tevent_req_post(req, state->ev);
+       }
+
+       DBG_DEBUG("open execution phase\n");
+
+       /*
+        * For the backend file open procedure, there are
+        * three possible modes: replay operation (in which case
+        * there is nothing else to do), durable_reconnect or
+        * new open.
+        */
+       if (state->replay_operation) {
+               state->result = state->op->compat;
+               state->result->op = state->op;
+               state->update_open = false;
+               state->info = state->op->create_action;
+
+               smbd_smb2_create_after_exec(req);
+               if (!tevent_req_is_in_progress(req)) {
+                       return req;
                }
 
-               if (exta) {
-                       ea_list = read_nttrans_ea_list(mem_ctx,
-                               (const char *)exta->data.data, exta->data.length);
-                       if (!ea_list) {
-                               DEBUG(10,("smbd_smb2_create_send: read_ea_name_list failed.\n"));
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+               smbd_smb2_create_finish(req);
+               return req;
 
-                       if (ea_list_has_invalid_name(ea_list)) {
-                               tevent_req_nterror(req, STATUS_INVALID_EA_NAME);
-                               return tevent_req_post(req, ev);
-                       }
+       } else if (state->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,
+                                              state->persistent_id,
+                                              state->create_guid,
+                                              now,
+                                              &state->op);
+               if (!NT_STATUS_IS_OK(status)) {
+                       DBG_NOTICE("smb2srv_open_recreate failed: %s\n",
+                                  nt_errstr(status));
+                       tevent_req_nterror(req, status);
+                       return tevent_req_post(req, state->ev);
                }
 
-               if (mxac) {
-                       if (mxac->data.length == 0) {
-                               max_access_time = 0;
-                       } else if (mxac->data.length == 8) {
-                               max_access_time = BVAL(mxac->data.data, 0);
-                       } else {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+               DBG_DEBUG("%s to recreate durable handle\n",
+                         state->op->global->durable ? "succeeded" : "failed");
+
+               if (!state->op->global->durable) {
+                       talloc_free(state->op);
+                       tevent_req_nterror(req,
+                                          NT_STATUS_OBJECT_NAME_NOT_FOUND);
+                       return tevent_req_post(req, state->ev);
                }
 
-               if (secd) {
-                       enum ndr_err_code ndr_err;
+               status = SMB_VFS_DURABLE_RECONNECT(smb1req->conn,
+                                                  smb1req,
+                                                  state->op, /* smbXsrv_open input */
+                                                  state->op->global->backend_cookie,
+                                                  state->op, /* TALLOC_CTX */
+                                                  &state->result,
+                                                  &new_cookie);
+               if (!NT_STATUS_IS_OK(status)) {
+                       NTSTATUS return_status;
 
-                       sec_desc = talloc_zero(state, struct security_descriptor);
-                       if (tevent_req_nomem(sec_desc, req)) {
-                               return tevent_req_post(req, ev);
-                       }
+                       return_status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
-                       ndr_err = ndr_pull_struct_blob(&secd->data,
-                               sec_desc, sec_desc,
-                               (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
-                       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-                               DEBUG(2,("ndr_pull_security_descriptor failed: %s\n",
-                                        ndr_errstr(ndr_err)));
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
-               }
+                       DBG_NOTICE("durable_reconnect failed: %s => %s\n",
+                                  nt_errstr(status),
+                                  nt_errstr(return_status));
 
-               if (dhnq) {
-                       if (dhnq->data.length != 16) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+                       tevent_req_nterror(req, return_status);
+                       return tevent_req_post(req, state->ev);
+               }
 
-                       if (dh2q) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+               DBG_DEBUG("oplock_type=%u, lease_ptr==%p\n",
+                         (unsigned)state->result->oplock_type, state->lease_ptr);
 
-                       /*
-                        * durable handle request is processed below.
-                        */
-                       durable_requested = true;
-                       /*
-                        * Set the timeout to 16 mins.
-                        *
-                        * TODO: test this against Windows 2012
-                        *       as the default for durable v2 is 1 min.
-                        */
-                       durable_timeout_msec = (16*60*1000);
+               status = smbd_smb2_create_durable_lease_check(
+                       smb1req, state->fname, state->result, state->lease_ptr);
+               if (!NT_STATUS_IS_OK(status)) {
+                       close_file(smb1req, state->result, SHUTDOWN_CLOSE);
+                       tevent_req_nterror(req, status);
+                       return tevent_req_post(req, state->ev);
                }
 
-               if (dh2q) {
-                       const uint8_t *p = dh2q->data.data;
-                       uint32_t durable_v2_timeout = 0;
-                       DATA_BLOB create_guid_blob;
+               data_blob_free(&state->op->global->backend_cookie);
+               state->op->global->backend_cookie = new_cookie;
 
-                       if (dh2q->data.length != 32) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+               state->op->status = NT_STATUS_OK;
+               state->op->global->disconnect_time = 0;
 
-                       if (dhnq) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+               /* save the timout for later update */
+               state->durable_timeout_msec = state->op->global->durable_timeout_msec;
 
-                       durable_v2_timeout = IVAL(p, 0);
-                       create_guid_blob = data_blob_const(p + 16, 16);
+               state->update_open = true;
 
-                       status = GUID_from_ndr_blob(&create_guid_blob,
-                                                   &_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;
+               state->info = FILE_WAS_OPENED;
 
-                       /*
-                        * durable handle v2 request processed below
-                        */
-                       durable_requested = true;
-                       durable_timeout_msec = durable_v2_timeout;
-                       if (durable_timeout_msec == 0) {
-                               /*
-                                * Set the timeout to 1 min as default.
-                                *
-                                * This matches Windows 2012.
-                                */
-                               durable_timeout_msec = (60*1000);
-                       }
+               smbd_smb2_create_after_exec(req);
+               if (!tevent_req_is_in_progress(req)) {
+                       return req;
                }
 
-               if (dhnc) {
-                       persistent_id = BVAL(dhnc->data.data, 0);
+               smbd_smb2_create_finish(req);
+               return req;
+       }
 
-                       do_durable_reconnect = true;
+       if (state->requested_oplock_level == SMB2_OPLOCK_LEVEL_LEASE) {
+               if (state->lease_ptr == NULL) {
+                       state->requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
                }
+       } else {
+               state->lease_ptr = NULL;
+       }
+
+       /*
+        * For a DFS path the function parse_dfs_path()
+        * will do the path processing.
+        */
 
-               if (dh2c) {
-                       const uint8_t *p = dh2c->data.data;
-                       DATA_BLOB create_guid_blob;
+       if (!(smb1req->flags2 & FLAGS2_DFS_PATHNAMES)) {
+               /* convert '\\' into '/' */
+               status = check_path_syntax(state->fname);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       return tevent_req_post(req, state->ev);
+               }
+       }
 
-                       persistent_id = BVAL(p, 0);
-                       create_guid_blob = data_blob_const(p + 16, 16);
+       ucf_flags = filename_create_ucf_flags(
+               smb1req, state->in_create_disposition);
+       status = filename_convert(req,
+                                 smb1req->conn,
+                                 state->fname,
+                                 ucf_flags,
+                                 NULL, /* ppath_contains_wcards */
+                                 &smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               tevent_req_nterror(req, status);
+               return tevent_req_post(req, state->ev);
+       }
 
-                       status = GUID_from_ndr_blob(&create_guid_blob,
-                                                   &_create_guid);
-                       if (tevent_req_nterror(req, status)) {
-                               return tevent_req_post(req, ev);
-                       }
-                       create_guid = &_create_guid;
+       /*
+        * 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.
+        */
 
-                       do_durable_reconnect = true;
+       if (in_impersonation_level >
+           SMB2_IMPERSONATION_DELEGATE) {
+               tevent_req_nterror(req,
+                                  NT_STATUS_BAD_IMPERSONATION_LEVEL);
+               return tevent_req_post(req, state->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, state->ev);
+       }
+
+       status = SMB_VFS_CREATE_FILE(smb1req->conn,
+                                    smb1req,
+                                    0, /* root_dir_fid */
+                                    smb_fname,
+                                    in_desired_access,
+                                    in_share_access,
+                                    state->in_create_disposition,
+                                    in_create_options,
+                                    in_file_attributes,
+                                    map_smb2_oplock_levels_to_samba(
+                                            state->requested_oplock_level),
+                                    state->lease_ptr,
+                                    state->allocation_size,
+                                    0, /* private_flags */
+                                    state->sec_desc,
+                                    state->ea_list,
+                                    &state->result,
+                                    &state->info,
+                                    &in_context_blobs,
+                                    state->out_context_blobs);
+       if (!NT_STATUS_IS_OK(status)) {
+               if (open_was_deferred(smb1req->xconn, smb1req->mid)) {
+                       SMBPROFILE_IOBYTES_ASYNC_SET_IDLE(smb2req->profile);
+                       return req;
                }
+               tevent_req_nterror(req, status);
+               return tevent_req_post(req, state->ev);
+       }
+       state->op = state->result->op;
 
-               if (alsi) {
-                       if (alsi->data.length != 8) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
-                       allocation_size = BVAL(alsi->data.data, 0);
+       smbd_smb2_create_after_exec(req);
+       if (!tevent_req_is_in_progress(req)) {
+               return req;
+       }
+
+       smbd_smb2_create_finish(req);
+       return req;
+}
+
+static void smbd_smb2_create_before_exec(struct tevent_req *req)
+{
+       struct smbd_smb2_create_state *state = tevent_req_data(
+               req, struct smbd_smb2_create_state);
+       struct smb_request *smb1req = state->smb1req;
+       struct smbd_smb2_request *smb2req = state->smb2req;
+       NTSTATUS status;
+
+       if (state->exta != NULL) {
+               if (!lp_ea_support(SNUM(smb2req->tcon->compat))) {
+                       tevent_req_nterror(req, NT_STATUS_EAS_NOT_SUPPORTED);
+                       return;
                }
 
-               if (twrp) {
-                       NTTIME nttime;
-                       time_t t;
-                       struct tm *tm;
+               state->ea_list = read_nttrans_ea_list(
+                       state,
+                       (const char *)state->exta->data.data,
+                       state->exta->data.length);
+               if (state->ea_list == NULL) {
+                       DEBUG(10,("smbd_smb2_create_send: read_ea_name_list failed.\n"));
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
 
-                       if (twrp->data.length != 8) {
-                               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(state->ea_list)) {
+                       tevent_req_nterror(req, STATUS_INVALID_EA_NAME);
+                       return;
+               }
+       }
 
-                       nttime = BVAL(twrp->data.data, 0);
-                       t = nt_time_to_unix(nttime);
-                       tm = gmtime(&t);
-
-                       TALLOC_FREE(fname);
-                       fname = talloc_asprintf(state,
-                                       "@GMT-%04u.%02u.%02u-%02u.%02u.%02u\\%s",
-                                       tm->tm_year + 1900,
-                                       tm->tm_mon + 1,
-                                       tm->tm_mday,
-                                       tm->tm_hour,
-                                       tm->tm_min,
-                                       tm->tm_sec,
-                                       in_name);
-                       if (tevent_req_nomem(fname, req)) {
-                               return tevent_req_post(req, ev);
-                       }
+       if (state->mxac != NULL) {
+               if (state->mxac->data.length == 0) {
+                       state->max_access_time = 0;
+               } else if (state->mxac->data.length == 8) {
+                       state->max_access_time = BVAL(state->mxac->data.data, 0);
+               } else {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
                }
+       }
 
-               if (qfid) {
-                       if (qfid->data.length != 0) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
-                               return tevent_req_post(req, ev);
-                       }
+       if (state->secd != NULL) {
+               enum ndr_err_code ndr_err;
+
+               state->sec_desc = talloc_zero(state, struct security_descriptor);
+               if (tevent_req_nomem(state->sec_desc, req)) {
+                       return;
                }
 
-               /* these are ignored for SMB2 */
-               in_create_options &= ~(0x10);/* NTCREATEX_OPTIONS_SYNC_ALERT */
-               in_create_options &= ~(0x20);/* NTCREATEX_OPTIONS_ASYNC_ALERT */
+               ndr_err = ndr_pull_struct_blob(&state->secd->data,
+                                              state->sec_desc, state->sec_desc,
+                                              (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
+               if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+                       DEBUG(2,("ndr_pull_security_descriptor failed: %s\n",
+                                ndr_errstr(ndr_err)));
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
+       }
 
-               in_file_attributes &= ~FILE_FLAG_POSIX_SEMANTICS;
+       if (state->dhnq != NULL) {
+               if (state->dhnq->data.length != 16) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
 
-               DEBUG(10, ("smbd_smb2_create_send: open execution phase\n"));
+               if (state->dh2q != NULL) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
 
                /*
-                * For the backend file open procedure, there are
-                * two possible modes: durable_reconnect or not.
+                * durable handle request is processed below.
                 */
-               if (do_durable_reconnect) {
-                       DATA_BLOB new_cookie = data_blob_null;
-                       NTTIME now = timeval_to_nttime(&smb2req->request_time);
-
-                       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 failed: %s\n",
-                                         nt_errstr(status)));
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
-                       }
+               state->durable_requested = true;
+               /*
+                * Set the timeout to 16 mins.
+                *
+                * TODO: test this against Windows 2012
+                *       as the default for durable v2 is 1 min.
+                */
+               state->durable_timeout_msec = (16*60*1000);
+       }
 
-                       DEBUG(10, ("smb2_create_send: %s to recreate the "
-                                  "smb2srv_open struct for a durable handle.\n",
-                                  op->global->durable ? "succeded" : "failed"));
+       if (state->dh2q != NULL) {
+               const uint8_t *p = state->dh2q->data.data;
+               uint32_t durable_v2_timeout = 0;
+               DATA_BLOB create_guid_blob;
+               const uint8_t *hdr;
+               uint32_t flags;
 
-                       if (!op->global->durable) {
-                               talloc_free(op);
-                               tevent_req_nterror(req,
-                                       NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                               return tevent_req_post(req, ev);
-                       }
+               if (state->dh2q->data.length != 32) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
 
-                       status = SMB_VFS_DURABLE_RECONNECT(smb1req->conn,
-                                               smb1req,
-                                               op, /* smbXsrv_open input */
-                                               op->global->backend_cookie,
-                                               op, /* TALLOC_CTX */
-                                               &result, &new_cookie);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               NTSTATUS return_status;
+               if (state->dhnq != NULL) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
 
-                               return_status = NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               durable_v2_timeout = IVAL(p, 0);
+               create_guid_blob = data_blob_const(p + 16, 16);
 
-                               DEBUG(3, ("smbd_smb2_create_send: "
-                                         "durable_reconnect failed: %s => %s\n",
-                                         nt_errstr(status),
-                                         nt_errstr(return_status)));
+               status = GUID_from_ndr_blob(&create_guid_blob,
+                                           &state->_create_guid);
+               if (tevent_req_nterror(req, status)) {
+                       return;
+               }
+               state->create_guid = &state->_create_guid;
 
-                               tevent_req_nterror(req, return_status);
-                               return tevent_req_post(req, ev);
-                       }
+               /*
+                * we need to store the create_guid later
+                */
+               state->update_open = true;
 
-                       data_blob_free(&op->global->backend_cookie);
-                       op->global->backend_cookie = new_cookie;
+               /*
+                * And we need to create a cache for replaying the
+                * create.
+                */
+               state->need_replay_cache = true;
 
-                       op->status = NT_STATUS_OK;
-                       op->global->disconnect_time = 0;
+               /*
+                * durable handle v2 request processed below
+                */
+               state->durable_requested = true;
+               state->durable_timeout_msec = durable_v2_timeout;
+               if (state->durable_timeout_msec == 0) {
+                       /*
+                        * Set the timeout to 1 min as default.
+                        *
+                        * This matches Windows 2012.
+                        */
+                       state->durable_timeout_msec = (60*1000);
+               }
 
-                       /* save the timout for later update */
-                       durable_timeout_msec = op->global->durable_timeout_msec;
+               /*
+                * 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);
+               state->replay_operation =
+                       flags & SMB2_HDR_FLAG_REPLAY_OPERATION;
+
+               status = smb2srv_open_lookup_replay_cache(smb2req->xconn,
+                                                         state->create_guid,
+                                                         0 /* now */,
+                                                         &state->op);
+               if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
+                       state->replay_operation = false;
+               } else if (tevent_req_nterror(req, status)) {
+                       DBG_WARNING("smb2srv_open_lookup_replay_cache "
+                                   "failed: %s\n", nt_errstr(status));
+                       return;
+               } else if (!state->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;
+               }
+       }
 
-                       update_open = true;
+       if (state->dhnc != NULL) {
+               state->persistent_id = BVAL(state->dhnc->data.data, 0);
+               state->do_durable_reconnect = true;
+       }
 
-                       info = FILE_WAS_OPENED;
-               } else {
-                       struct smb_filename *smb_fname = NULL;
+       if (state->dh2c != NULL) {
+               const uint8_t *p = state->dh2c->data.data;
+               DATA_BLOB create_guid_blob;
 
-                       /*
-                        * For a DFS path the function parse_dfs_path()
-                        * will do the path processing.
-                        */
+               state->persistent_id = BVAL(p, 0);
+               create_guid_blob = data_blob_const(p + 16, 16);
 
-                       if (!(smb1req->flags2 & FLAGS2_DFS_PATHNAMES)) {
-                               /* convert '\\' into '/' */
-                               status = check_path_syntax(fname);
-                               if (!NT_STATUS_IS_OK(status)) {
-                                       tevent_req_nterror(req, status);
-                                       return tevent_req_post(req, ev);
-                               }
-                       }
+               status = GUID_from_ndr_blob(&create_guid_blob,
+                                           &state->_create_guid);
+               if (tevent_req_nterror(req, status)) {
+                       return;
+               }
 
-                       status = filename_convert(req,
-                                                 smb1req->conn,
-                                                 smb1req->flags2 & FLAGS2_DFS_PATHNAMES,
-                                                 fname,
-                                                 (in_create_disposition == FILE_CREATE) ?
-                                                 UCF_CREATING_FILE : 0,
-                                                 NULL, /* ppath_contains_wcards */
-                                                 &smb_fname);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
-                       }
+               state->create_guid = &state->_create_guid;
+               state->do_durable_reconnect = true;
+       }
 
-                       status = SMB_VFS_CREATE_FILE(smb1req->conn,
-                                                    smb1req,
-                                                    0, /* root_dir_fid */
-                                                    smb_fname,
-                                                    in_desired_access,
-                                                    in_share_access,
-                                                    in_create_disposition,
-                                                    in_create_options,
-                                                    in_file_attributes,
-                                                    map_smb2_oplock_levels_to_samba(requested_oplock_level),
-                                                    allocation_size,
-                                                    0, /* private_flags */
-                                                    sec_desc,
-                                                    ea_list,
-                                                    &result,
-                                                    &info);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               if (open_was_deferred(smb1req->sconn, smb1req->mid)) {
-                                       return req;
-                               }
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
-                       }
-                       op = result->op;
+       if (state->alsi != NULL) {
+               if (state->alsi->data.length != 8) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
+               }
+               state->allocation_size = BVAL(state->alsi->data.data, 0);
+       }
+
+       if (state->twrp != NULL) {
+               NTTIME nttime;
+               time_t t;
+               struct tm *tm;
+               char *tmpname = state->fname;
+
+               if (state->twrp->data.length != 8) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
                }
 
+               nttime = BVAL(state->twrp->data.data, 0);
+               t = nt_time_to_unix(nttime);
+               tm = gmtime(&t);
+
+               state->fname = talloc_asprintf(
+                       state,
+                       "%s\\@GMT-%04u.%02u.%02u-%02u.%02u.%02u",
+                       state->fname,
+                       tm->tm_year + 1900,
+                       tm->tm_mon + 1,
+                       tm->tm_mday,
+                       tm->tm_hour,
+                       tm->tm_min,
+                       tm->tm_sec);
+               if (tevent_req_nomem(state->fname, req)) {
+                       return;
+               }
+               TALLOC_FREE(tmpname);
                /*
-                * here we have op == result->op
+                * Tell filename_create_ucf_flags() this
+                * is an @GMT path.
                 */
+               smb1req->flags2 |= FLAGS2_REPARSE_PATH;
+       }
 
-               DEBUG(10, ("smbd_smb2_create_send: "
-                          "response construction phase\n"));
-
-               if (mxac) {
-                       NTTIME last_write_time;
-
-                       unix_timespec_to_nt_time(&last_write_time,
-                                                result->fsp_name->st.st_ex_mtime);
-                       if (last_write_time != max_access_time) {
-                               uint8_t p[8];
-                               uint32_t max_access_granted;
-                               DATA_BLOB blob = data_blob_const(p, sizeof(p));
-
-                               status = smbd_calculate_access_mask(smb1req->conn,
-                                                       result->fsp_name,
-                                                       false,
-                                                       SEC_FLAG_MAXIMUM_ALLOWED,
-                                                       &max_access_granted);
-
-                               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);
-                               if (!NT_STATUS_IS_OK(status)) {
-                                       tevent_req_nterror(req, status);
-                                       return tevent_req_post(req, ev);
-                               }
-                       }
+       if (state->qfid != NULL) {
+               if (state->qfid->data.length != 0) {
+                       tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                       return;
                }
+       }
 
-               if (durable_requested &&
-                   BATCH_OPLOCK_TYPE(result->oplock_type))
-               {
-                       status = SMB_VFS_DURABLE_COOKIE(result,
-                                               op,
-                                               &op->global->backend_cookie);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               op->global->backend_cookie = data_blob_null;
-                       }
+       if (state->rqls != NULL) {
+               ssize_t lease_len = -1;
+
+               lease_len = smb2_lease_pull(state->rqls->data.data,
+                                           state->rqls->data.length,
+                                           &state->lease);
+               if (lease_len == -1) {
+                       tevent_req_nterror(
+                               req, NT_STATUS_INVALID_PARAMETER);
+                       return;
                }
-               if (op->global->backend_cookie.length > 0) {
-                       update_open = true;
+               state->lease_ptr = &state->lease;
 
-                       op->global->durable = true;
-                       op->global->durable_timeout_msec = durable_timeout_msec;
+               if (DEBUGLEVEL >= 10) {
+                       DEBUG(10, ("Got lease request size %d\n",
+                                  (int)lease_len));
+                       NDR_PRINT_DEBUG(smb2_lease, state->lease_ptr);
                }
 
-               if (update_open) {
-                       op->global->create_guid = _create_guid;
+               if (!smb2_lease_key_valid(&state->lease.lease_key)) {
+                       state->lease_ptr = NULL;
+                       state->requested_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
+               }
 
-                       status = smbXsrv_open_update(op);
-                       DEBUG(10, ("smb2_create_send: smbXsrv_open_update "
-                                  "returned %s\n",
-                                  nt_errstr(status)));
-                       if (!NT_STATUS_IS_OK(status)) {
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
+               if ((smb2req->xconn->protocol < PROTOCOL_SMB3_00) &&
+                   (state->lease.lease_version != 1))
+               {
+                       DEBUG(10, ("v2 lease key only for SMB3\n"));
+                       state->lease_ptr = NULL;
+               }
+
+               /*
+                * Replay with a lease is only allowed if the
+                * established open carries a lease with the
+                * same lease key.
+                */
+               if (state->replay_operation) {
+                       struct smb2_lease *op_ls =
+                               &state->op->compat->lease->lease;
+                       int op_oplock = state->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;
+                       }
+                       if (!smb2_lease_key_equal(&state->lease.lease_key,
+                                                 &op_ls->lease_key))
+                       {
+                               status = NT_STATUS_ACCESS_DENIED;
+                               (void)tevent_req_nterror(req, status);
+                               return;
                        }
                }
+       }
+
+       return;
+}
+
+static void smbd_smb2_create_after_exec(struct tevent_req *req)
+{
+       struct smbd_smb2_create_state *state = tevent_req_data(
+               req, struct smbd_smb2_create_state);
+       struct smb_request *smb1req = state->smb1req;
+       NTSTATUS status;
+
+       /*
+        * here we have op == result->op
+        */
+
+       DEBUG(10, ("smbd_smb2_create_send: "
+                  "response construction phase\n"));
+
+       if (state->mxac != NULL) {
+               NTTIME last_write_time;
 
-               if (dhnq && op->global->durable) {
-                       uint8_t p[8] = { 0, };
+               last_write_time = unix_timespec_to_nt_time(
+                       state->result->fsp_name->st.st_ex_mtime);
+               if (last_write_time != state->max_access_time) {
+                       uint8_t p[8];
+                       uint32_t max_access_granted;
                        DATA_BLOB blob = data_blob_const(p, sizeof(p));
 
-                       status = smb2_create_blob_add(state,
-                                                     &out_context_blobs,
-                                                     SMB2_CREATE_TAG_DHNQ,
-                                                     blob);
+                       status = smbd_calculate_access_mask(smb1req->conn,
+                                                           state->result->fsp_name,
+                                                           false,
+                                                           SEC_FLAG_MAXIMUM_ALLOWED,
+                                                           &max_access_granted);
+
+                       SIVAL(p, 0, NT_STATUS_V(status));
+                       SIVAL(p, 4, max_access_granted);
+
+                       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);
+                               tevent_req_post(req, state->ev);
+                               return;
                        }
                }
+       }
 
-               if (dh2q && op->global->durable) {
-                       uint8_t p[8] = { 0, };
-                       DATA_BLOB blob = data_blob_const(p, sizeof(p));
-                       uint32_t durable_v2_response_flags = 0;
+       if (!state->replay_operation && state->durable_requested &&
+           (fsp_lease_type(state->result) & SMB2_LEASE_HANDLE))
+       {
+               status = SMB_VFS_DURABLE_COOKIE(
+                       state->result,
+                       state->op,
+                       &state->op->global->backend_cookie);
+               if (!NT_STATUS_IS_OK(status)) {
+                       state->op->global->backend_cookie = data_blob_null;
+               }
+       }
+       if (!state->replay_operation && state->op->global->backend_cookie.length > 0)
+       {
+               state->update_open = true;
 
-                       SIVAL(p, 0, op->global->durable_timeout_msec);
-                       SIVAL(p, 4, durable_v2_response_flags);
+               state->op->global->durable = true;
+               state->op->global->durable_timeout_msec = state->durable_timeout_msec;
+       }
 
-                       status = smb2_create_blob_add(state, &out_context_blobs,
-                                                     SMB2_CREATE_TAG_DH2Q,
-                                                     blob);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
-                       }
+       if (state->update_open) {
+               state->op->global->create_guid = state->_create_guid;
+               if (state->need_replay_cache) {
+                       state->op->flags |= SMBXSRV_OPEN_NEED_REPLAY_CACHE;
                }
 
-               if (qfid) {
-                       uint8_t p[32];
-                       uint64_t file_index = get_FileIndex(result->conn,
-                                                       &result->fsp_name->st);
-                       DATA_BLOB blob = data_blob_const(p, sizeof(p));
+               status = smbXsrv_open_update(state->op);
+               DEBUG(10, ("smb2_create_send: smbXsrv_open_update "
+                          "returned %s\n",
+                          nt_errstr(status)));
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       tevent_req_post(req, state->ev);
+                       return;
+               }
+       }
 
-                       ZERO_STRUCT(p);
+       if (state->dhnq != NULL && state->op->global->durable) {
+               uint8_t p[8] = { 0, };
+               DATA_BLOB blob = data_blob_const(p, sizeof(p));
 
-                       /* From conversations with Microsoft engineers at
-                          the MS plugfest. The first 8 bytes are the "volume index"
-                          == inode, the second 8 bytes are the "volume id",
-                          == dev. This will be updated in the SMB2 doc. */
-                       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,
+                                             state->out_context_blobs,
+                                             SMB2_CREATE_TAG_DHNQ,
+                                             blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       tevent_req_post(req, state->ev);
+                       return;
+               }
+       }
 
-                       status = smb2_create_blob_add(state, &out_context_blobs,
-                                                     SMB2_CREATE_TAG_QFID,
-                                                     blob);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               tevent_req_nterror(req, status);
-                               return tevent_req_post(req, ev);
-                       }
+       if (state->dh2q != NULL && state->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...
+            */
+           (!state->replay_operation ||
+            state->in_oplock_level == SMB2_OPLOCK_LEVEL_BATCH ||
+            state->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;
+
+               SIVAL(p, 0, state->op->global->durable_timeout_msec);
+               SIVAL(p, 4, durable_v2_response_flags);
+
+               status = smb2_create_blob_add(state->out_context_blobs,
+                                             state->out_context_blobs,
+                                             SMB2_CREATE_TAG_DH2Q,
+                                             blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       tevent_req_post(req, state->ev);
+                       return;
                }
        }
 
+       if (state->qfid != NULL) {
+               uint8_t p[32];
+               uint64_t file_index = get_FileIndex(state->result->conn,
+                                                   &state->result->fsp_name->st);
+               DATA_BLOB blob = data_blob_const(p, sizeof(p));
+
+               ZERO_STRUCT(p);
+
+               /* From conversations with Microsoft engineers at
+                  the MS plugfest. The first 8 bytes are the "volume index"
+                  == inode, the second 8 bytes are the "volume id",
+                  == dev. This will be updated in the SMB2 doc. */
+               SBVAL(p, 0, file_index);
+               SIVAL(p, 8, state->result->fsp_name->st.st_ex_dev);/* FileIndexHigh */
+
+               status = smb2_create_blob_add(state->out_context_blobs,
+                                             state->out_context_blobs,
+                                             SMB2_CREATE_TAG_QFID,
+                                             blob);
+               if (!NT_STATUS_IS_OK(status)) {
+                       tevent_req_nterror(req, status);
+                       tevent_req_post(req, state->ev);
+                       return;
+               }
+       }
+
+       if ((state->rqls != NULL) && (state->result->oplock_type == LEASE_OPLOCK)) {
+               uint8_t buf[52];
+               struct smb2_lease lease;
+               size_t lease_len;
+
+               lease = state->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);
+                       tevent_req_post(req, state->ev);
+                       return;
+               }
+
+               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);
+                       tevent_req_post(req, state->ev);
+                       return;
+               }
+       }
+
+       return;
+}
+
+static void smbd_smb2_create_finish(struct tevent_req *req)
+{
+       struct smbd_smb2_create_state *state = tevent_req_data(
+               req, struct smbd_smb2_create_state);
+       struct smbd_smb2_request *smb2req = state->smb2req;
+       struct smb_request *smb1req = state->smb1req;
+       files_struct *result = state->result;
+
        smb2req->compat_chain_fsp = smb1req->chain_fsp;
 
-       if(lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
-               state->out_oplock_level = in_oplock_level;
+       if (state->replay_operation) {
+               state->out_oplock_level = state->in_oplock_level;
+       } else if (lp_fake_oplocks(SNUM(smb2req->tcon->compat))) {
+               state->out_oplock_level = state->in_oplock_level;
        } else {
                state->out_oplock_level = map_samba_oplock_levels_to_smb2(result->oplock_type);
        }
 
-       if ((in_create_disposition == FILE_SUPERSEDE)
-           && (info == FILE_WAS_OVERWRITTEN)) {
+       if ((state->in_create_disposition == FILE_SUPERSEDE)
+           && (state->info == FILE_WAS_OVERWRITTEN)) {
                state->out_create_action = FILE_WAS_SUPERSEDED;
        } else {
-               state->out_create_action = info;
+               state->out_create_action = state->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));
@@ -1082,23 +1517,22 @@ 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)));
+       DBG_DEBUG("%s - %s\n", fsp_str_dbg(result), fsp_fnum_dbg(result));
 
        tevent_req_done(req);
-       return tevent_req_post(req, ev);
+       tevent_req_post(req, state->ev);
+       return;
 }
 
 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,
@@ -1117,18 +1551,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;
@@ -1140,7 +1574,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;
@@ -1162,8 +1596,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;
 }
@@ -1174,11 +1608,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. */
@@ -1196,12 +1630,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",
@@ -1252,18 +1686,16 @@ static void remove_deferred_open_message_smb2_internal(struct smbd_smb2_request
                (unsigned long long)mid ));
 
        state->open_was_deferred = false;
-       /* Ensure we don't have any outstanding timer event. */
-       TALLOC_FREE(state->te);
        /* Ensure we don't have any outstanding immediate event. */
        TALLOC_FREE(state->im);
 }
 
 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: "
@@ -1280,7 +1712,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;
 
@@ -1290,18 +1721,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,8 +1753,6 @@ bool schedule_deferred_open_message_smb2(
                return false;
        }
 
-       /* Ensure we don't have any outstanding timer event. */
-       TALLOC_FREE(state->te);
        /* Ensure we don't have any outstanding immediate event. */
        TALLOC_FREE(state->im);
 
@@ -1337,7 +1767,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;
        }
@@ -1347,7 +1777,7 @@ bool schedule_deferred_open_message_smb2(
                (unsigned long long)mid ));
 
        tevent_schedule_immediate(state->im,
-                       smb2req->sconn->ev_ctx,
+                       smb2req->ev_ctx,
                        smbd_smb2_create_request_dispatch_immediate,
                        smb2req);
 
@@ -1372,14 +1802,14 @@ 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_message_smb2_internal(smb2req, mid);
 
-       tevent_req_defer_callback(req, smb2req->sconn->ev_ctx);
+       tevent_req_defer_callback(req, smb2req->ev_ctx);
        tevent_req_nterror(req, NT_STATUS_CANCELLED);
        return true;
 }
@@ -1388,8 +1818,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;
@@ -1408,11 +1837,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);