s3:smbd:smb2_create: add some comment
[metze/samba/wip.git] / source3 / smbd / smb2_create.c
index 70f0dba404d3fa368be9786005946e85e2371007..28d50740ba44a210b4dc8902e0fb96ce4bc4ca3b 100644 (file)
 
 #include "includes.h"
 #include "printing.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 #include "../librpc/gen_ndr/ndr_security.h"
+#include "../lib/util/tevent_ntstatus.h"
+#include "messages.h"
+#include "librpc/gen_ndr/open_files.h"
+#include "serverid.h"
 
 int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level)
 {
@@ -97,9 +102,8 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq);
 NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
 {
        const uint8_t *inbody;
+       const struct iovec *indyniov;
        int i = smb2req->current_idx;
-       size_t expected_body_size = 0x39;
-       size_t body_size;
        uint8_t in_oplock_level;
        uint32_t in_impersonation_level;
        uint32_t in_desired_access;
@@ -125,17 +129,12 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
        bool ok;
        struct tevent_req *tsubreq;
 
-       if (smb2req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) {
-               return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
+       status = smbd_smb2_request_verify_sizes(smb2req, 0x39);
+       if (!NT_STATUS_IS_OK(status)) {
+               return smbd_smb2_request_error(smb2req, status);
        }
-
        inbody = (const uint8_t *)smb2req->in.vector[i+1].iov_base;
 
-       body_size = SVAL(inbody, 0x00);
-       if (body_size != expected_body_size) {
-               return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
-       }
-
        in_oplock_level         = CVAL(inbody, 0x03);
        in_impersonation_level  = IVAL(inbody, 0x04);
        in_desired_access       = IVAL(inbody, 0x18);
@@ -156,7 +155,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
         *       overlap
         */
 
-       dyn_offset = SMB2_HDR_BODY + (body_size & 0xFFFFFFFE);
+       dyn_offset = SMB2_HDR_BODY + smb2req->in.vector[i+1].iov_len;
 
        if (in_name_offset == 0 && in_name_length == 0) {
                /* This is ok */
@@ -167,18 +166,19 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
                name_offset = in_name_offset - dyn_offset;
        }
 
-       if (name_offset > smb2req->in.vector[i+2].iov_len) {
+       indyniov = &smb2req->in.vector[i+2];
+
+       if (name_offset > indyniov->iov_len) {
                return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       name_available_length = smb2req->in.vector[i+2].iov_len - name_offset;
+       name_available_length = indyniov->iov_len - name_offset;
 
        if (in_name_length > name_available_length) {
                return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       in_name_buffer.data = (uint8_t *)smb2req->in.vector[i+2].iov_base +
-                             name_offset;
+       in_name_buffer.data = (uint8_t *)indyniov->iov_base + name_offset;
        in_name_buffer.length = in_name_length;
 
        if (in_context_offset == 0 && in_context_length == 0) {
@@ -190,18 +190,18 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
                context_offset = in_context_offset - dyn_offset;
        }
 
-       if (context_offset > smb2req->in.vector[i+2].iov_len) {
+       if (context_offset > indyniov->iov_len) {
                return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       context_available_length = smb2req->in.vector[i+2].iov_len - context_offset;
+       context_available_length = indyniov->iov_len - context_offset;
 
        if (in_context_length > context_available_length) {
                return smbd_smb2_request_error(smb2req, NT_STATUS_INVALID_PARAMETER);
        }
 
-       in_context_buffer.data = (uint8_t *)smb2req->in.vector[i+2].iov_base +
-                                 context_offset;
+       in_context_buffer.data = (uint8_t *)indyniov->iov_base +
+               context_offset;
        in_context_buffer.length = in_context_length;
 
        /*
@@ -217,6 +217,14 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
                return smbd_smb2_request_error(smb2req, NT_STATUS_ILLEGAL_CHARACTER);
        }
 
+       if (in_name_buffer.length == 0) {
+               in_name_string_size = 0;
+       }
+
+       if (strlen(in_name_string) != in_name_string_size) {
+               return smbd_smb2_request_error(smb2req, NT_STATUS_OBJECT_NAME_INVALID);
+       }
+
        ZERO_STRUCT(in_context_blobs);
        status = smb2_create_blob_parse(smb2req, in_context_buffer, &in_context_blobs);
        if (!NT_STATUS_IS_OK(status)) {
@@ -224,7 +232,7 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
        }
 
        tsubreq = smbd_smb2_create_send(smb2req,
-                                      smb2req->sconn->smb2.event_ctx,
+                                      smb2req->sconn->ev_ctx,
                                       smb2req,
                                       in_oplock_level,
                                       in_impersonation_level,
@@ -241,7 +249,13 @@ NTSTATUS smbd_smb2_request_process_create(struct smbd_smb2_request *smb2req)
        }
        tevent_req_set_callback(tsubreq, smbd_smb2_request_create_done, smb2req);
 
-       return smbd_smb2_request_pending_queue(smb2req, tsubreq);
+       /*
+        * 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);
 }
 
 static uint64_t get_mid_from_smb2req(struct smbd_smb2_request *smb2req)
@@ -254,8 +268,6 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
 {
        struct smbd_smb2_request *smb2req = tevent_req_callback_data(tsubreq,
                                        struct smbd_smb2_request);
-       int i = smb2req->current_idx;
-       uint8_t *outhdr;
        DATA_BLOB outbody;
        DATA_BLOB outdyn;
        uint8_t out_oplock_level = 0;
@@ -327,8 +339,6 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
                out_context_buffer_offset = SMB2_HDR_BODY + 0x58;
        }
 
-       outhdr = (uint8_t *)smb2req->out.vector[i].iov_base;
-
        outbody = data_blob_talloc(smb2req->out.vector, NULL, 0x58);
        if (outbody.data == NULL) {
                error = smbd_smb2_request_error(smb2req, NT_STATUS_NO_MEMORY);
@@ -380,6 +390,174 @@ static void smbd_smb2_request_create_done(struct tevent_req *tsubreq)
        }
 }
 
+/*
+ * TODO: needs to be moved - copied from source3/smbd/files.c
+ */
+static unsigned long get_gen_count(struct smbd_server_connection *sconn)
+{
+       sconn->file_gen_counter += 1;
+       if (sconn->file_gen_counter == 0) {
+               sconn->file_gen_counter += 1;
+       }
+
+       return sconn->file_gen_counter;
+}
+
+static NTSTATUS new_durable_reconnect_fsp(struct smbXsrv_open *op,
+                                         struct connection_struct *conn,
+                                         struct smb_filename *smb_fname,
+                                         TALLOC_CTX *mem_ctx,
+                                         files_struct **_fsp)
+{
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
+       files_struct *fsp = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
+       struct smbd_server_connection *sconn = op->connection->sconn;
+
+       fsp = talloc_zero(frame, struct files_struct);
+       if (fsp == NULL) {
+               goto fail;
+       }
+
+       /*
+        * This can't be a child of fsp because the file_handle can be ref'd
+        * when doing a dos/fcb open, which will then share the file_handle
+        * across multiple fsps.
+        */
+       fsp->fh = talloc_zero(frame, struct fd_handle);
+       if (fsp->fh == NULL) {
+               goto fail;
+       }
+
+       status = fsp_set_smb_fname(fsp, smb_fname);
+       if (!NT_STATUS_IS_OK(status)) {
+               goto fail;
+       }
+
+       fsp->fh->ref_count = 1;
+       fsp->fh->fd = -1;
+       fsp->fh->gen_id = get_gen_count(sconn);
+
+       fsp->conn = conn;
+
+
+       /* success */
+
+       talloc_steal(mem_ctx, fsp);
+       talloc_steal(mem_ctx, fsp->fh);
+       *_fsp = fsp;
+
+       status = NT_STATUS_OK;
+
+fail:
+       talloc_free(frame);
+       return status;
+}
+
+static NTSTATUS smb2_create_durable_reconnect(struct smbXsrv_open *op,
+                                             /* struct smb_request *smb1req, */
+                                             struct connection_struct *conn,
+                                             struct smb_filename *smb_fname,
+                                             TALLOC_CTX *mem_ctx,
+                                             files_struct **_fsp)
+{
+       struct share_mode_lock *sharemode_lock;
+       files_struct *fsp = NULL;
+       NTSTATUS status;
+
+DEBUG(0, ("OBNOX - durable_reconnect enter: (%s:%s)\n", __location__, __FUNCTION__));
+
+       /* 1. check entry in locking.tdb */
+
+       /*
+        * Q: fetch with lock right away?
+        */
+/*
+       sharemode_lock = fetch_share_mode_unlocked(mem_ctx,
+                                                  op->global->backend_file_id);
+*/
+       sharemode_lock = get_share_mode_lock(mem_ctx,
+                                            op->global->backend_file_id);
+       if (sharemode_lock == NULL) {
+               /* TODO: use/create other fetch func with better error code */
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (sharemode_lock->data->num_share_modes == 0) {
+               /* should not happen? internal error? */
+               return NT_STATUS_INTERNAL_DB_ERROR;
+       }
+
+       if (sharemode_lock->data->num_share_modes > 1) {
+               /*
+                * It can't be durable if there is more than one handle
+                * on the file.
+                */
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       if (serverid_exists(&sharemode_lock->data->share_modes[0].pid))  {
+               /*
+                * server still exists
+                * TODO: check whether session exists
+                *  (could have been a session_logoff())
+                */
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+
+       /* 2. proceed with opening file */
+
+       /*
+        * refetch with lock and update the pid  // fetch with lock right away above
+        */
+/*
+       talloc_free(sharemode_lock);
+       sharemode_lock = get_share_mode_lock(mem_ctx,
+                                            op->global->backend_file_id);
+       if (sharemode_lock == NULL) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+       }
+*/
+
+       sharemode_lock->data->share_modes[0].pid =
+               messaging_server_id(op->connection->sconn->msg_ctx);
+
+       /*
+        * circumstances seems ok, do the open
+        */
+       status = new_durable_reconnect_fsp(op, conn, smb_fname, mem_ctx, &fsp);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+DEBUG(0, ("OBNOX - durable_reconnect: new fsp created (%s:%s)\n", __location__, __FUNCTION__));
+
+       fsp->fh->fd = SMB_VFS_OPEN(conn,
+                                  smb_fname,
+                                  fsp,
+                                  sharemode_lock->data->share_modes[0].flags,
+                                  0 /* mode */);
+       if (fsp->fh->fd == -1) {
+               /* ... */
+               return NT_STATUS_UNSUCCESSFUL; // TODO ERROR CODE?
+       }
+
+       /* - release the sharemode lock: this writes the changes */
+       talloc_free(sharemode_lock);
+
+
+       /* Q: do this in fsp creation? */
+       op->fsp = fsp;
+       *_fsp = fsp;
+
+       /*
+        * - return
+        *
+        * ... think about seek()
+        */
+       return NT_STATUS_OK;
+}
+
 struct smbd_smb2_create_state {
        struct smbd_smb2_request *smb2req;
        struct smb_request *smb1req;
@@ -424,6 +602,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
        struct timespec write_time_ts;
        struct smb2_create_blobs out_context_blobs;
        int requested_oplock_level;
+       bool do_durable_reconnect = false;
+       struct smbXsrv_open *op = NULL;
 
        ZERO_STRUCT(out_context_blobs);
 
@@ -434,7 +614,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
        }
 
 
-       if (!smb2req->async) {
+       if (smb2req->subreq == NULL) {
                /* New create call. */
                req = tevent_req_create(mem_ctx, &state,
                                struct smbd_smb2_create_state);
@@ -442,13 +622,13 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        return NULL;
                }
                state->smb2req = smb2req;
-               smb2req->subreq = req; /* So we can find this when going async. */
 
                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 {
@@ -535,7 +715,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 
                if (exta) {
                        if (dhnc) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                               tevent_req_nterror(req,NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                return tevent_req_post(req, ev);
                        }
 
@@ -550,7 +730,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 
                if (mxac) {
                        if (dhnc) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                               tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                return tevent_req_post(req, ev);
                        }
 
@@ -568,7 +748,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        enum ndr_err_code ndr_err;
 
                        if (dhnc) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                               tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                return tevent_req_post(req, ev);
                        }
 
@@ -590,7 +770,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 
                if (dhnq) {
                        if (dhnc) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                               tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                return tevent_req_post(req, ev);
                        }
 
@@ -599,24 +779,45 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                return tevent_req_post(req, ev);
                        }
                        /*
-                        * we don't support durable handles yet
-                        * and have to ignore this
+                        * durable handle request is processed below.
                         */
                }
 
                if (dhnc) {
+                       uint64_t persistent_id;
+
+DEBUG(0, ("OBNOX - dhnc found (%s:%s)\n", __location__, __FUNCTION__));
+
                        if (dhnc->data.length != 16) {
                                tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
                                return tevent_req_post(req, ev);
                        }
-                       /* we don't support durable handles yet */
-                       tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
-                       return tevent_req_post(req, ev);
+
+                       persistent_id = BVAL(dhnc->data.data, 0);
+
+                       status = smb2srv_open_recreate(smb2req->sconn->conn,
+                                                      persistent_id,
+                                                      &op);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+
+                       /* TODO: needed? or is successful global_lookup enough?) */
+
+                       if (!op->global->durable) {
+                               talloc_free(op);
+                               tevent_req_nterror(req,
+                                       NT_STATUS_OBJECT_NAME_NOT_FOUND);
+                               return tevent_req_post(req, ev);
+                       }
+
+                       do_durable_reconnect = true;
                }
 
                if (alsi) {
                        if (dhnc) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                               tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                return tevent_req_post(req, ev);
                        }
 
@@ -633,7 +834,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        struct tm *tm;
 
                        if (dhnc) {
-                               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+                               tevent_req_nterror(req, NT_STATUS_OBJECT_NAME_NOT_FOUND);
                                return tevent_req_post(req, ev);
                        }
 
@@ -690,8 +891,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                          smb1req->conn,
                                          smb1req->flags2 & FLAGS2_DFS_PATHNAMES,
                                          fname,
-                                         0,
-                                         NULL,
+                                         0,    /* unix_convert flags */
+                                         NULL, /* ppath_contains_wcards */
                                          &smb_fname);
                if (!NT_STATUS_IS_OK(status)) {
                        tevent_req_nterror(req, status);
@@ -700,28 +901,47 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
 
                in_file_attributes &= ~FILE_FLAG_POSIX_SEMANTICS;
 
-               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->mid)) {
-                               return req;
+               /*
+                * For the backend file open procedure, there are
+                * two possible modes: durable_reconnect or not.
+                */
+               if (do_durable_reconnect) {
+                       status = smb2_create_durable_reconnect(op,
+                                                              smb1req->conn,
+                                                              smb_fname,
+                                                              mem_ctx,
+                                                              &result);
+
+DEBUG(0, ("OBNOX - durable_reconnect result: %s (%s:%s)\n", nt_errstr(status), __location__, __FUNCTION__));
+
+                       if (!NT_STATUS_IS_OK(status)) {
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+               } else {
+                       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);
                        }
-                       tevent_req_nterror(req, status);
-                       return tevent_req_post(req, ev);
                }
 
                if (mxac) {
@@ -734,7 +954,7 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                                uint32_t max_access_granted;
                                DATA_BLOB blob = data_blob_const(p, sizeof(p));
 
-                               status = smbd_check_open_rights(smb1req->conn,
+                               status = smbd_calculate_access_mask(smb1req->conn,
                                                        result->fsp_name,
                                                        SEC_FLAG_MAXIMUM_ALLOWED,
                                                        &max_access_granted);
@@ -753,6 +973,35 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        }
                }
 
+               /*
+                * windows createst a dhnc response blob upon dbnc request.
+                * this seems to contradict the documentation, though
+                * --> TODO:dochelp
+                */
+               if (dhnc || (dhnq && BATCH_OPLOCK_TYPE(result->oplock_type))) {
+                       uint8_t p[8];
+                       DATA_BLOB blob = data_blob_const(p, sizeof(p));
+
+                       result->smbXsrv->global->backend_file_id = result->file_id;
+                       result->smbXsrv->global->durable = true;
+
+                       status = smbXsrv_open_update(result->smbXsrv);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+
+                       ZERO_STRUCT(p);
+
+                       status = smb2_create_blob_add(state, &out_context_blobs,
+                                                     SMB2_CREATE_TAG_DHNQ,
+                                                     blob);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               tevent_req_nterror(req, status);
+                               return tevent_req_post(req, ev);
+                       }
+               }
+
                if (qfid) {
                        uint8_t p[32];
                        uint64_t file_index = get_FileIndex(result->conn,
@@ -813,14 +1062,15 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
                        get_change_timespec(smb1req->conn, result,
                                        result->fsp_name));
        state->out_allocation_size =
-                       result->fsp_name->st.st_ex_blksize *
-                       result->fsp_name->st.st_ex_blocks;
+                       SMB_VFS_GET_ALLOC_SIZE(smb1req->conn, result,
+                                              &(result->fsp_name->st));
        state->out_end_of_file = result->fsp_name->st.st_ex_size;
        if (state->out_file_attributes == 0) {
                state->out_file_attributes = FILE_ATTRIBUTE_NORMAL;
        }
-       state->out_file_id_persistent = result->fnum;
-       state->out_file_id_volatile = result->fnum;
+
+       state->out_file_id_persistent = result->smbXsrv->global->open_persistent_id;
+       state->out_file_id_volatile = result->smbXsrv->global->open_volatile_id;
        state->out_context_blobs = out_context_blobs;
 
        tevent_req_done(req);
@@ -884,7 +1134,7 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
        if (!smb2req) {
                return false;
        }
-       if (!smb2req->async) {
+       if (smb2req->async_te == NULL) {
                return false;
        }
        req = smb2req->subreq;
@@ -1074,6 +1324,7 @@ void schedule_deferred_open_message_smb2(
        if (!state->im) {
                smbd_server_connection_terminate(smb2req->sconn,
                        nt_errstr(NT_STATUS_NO_MEMORY));
+               return;
        }
 
        DEBUG(10,("schedule_deferred_open_message_smb2: "
@@ -1081,7 +1332,7 @@ void schedule_deferred_open_message_smb2(
                (unsigned long long)mid ));
 
        tevent_schedule_immediate(state->im,
-                       smb2req->sconn->smb2.event_ctx,
+                       smb2req->sconn->ev_ctx,
                        smbd_smb2_create_request_dispatch_immediate,
                        smb2req);
 }
@@ -1154,7 +1405,7 @@ static bool smbd_smb2_create_cancel(struct tevent_req *req)
        mid = get_mid_from_smb2req(smb2req);
 
        remove_deferred_open_entry(state->id, mid,
-                                  sconn_server_id(smb2req->sconn));
+                                  messaging_server_id(smb2req->sconn->msg_ctx));
        remove_deferred_open_message_smb2_internal(smb2req, mid);
        smb2req->cancelled = true;
 
@@ -1192,35 +1443,6 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
                return false;
        }
 
-#if 1
-       /* Boo - turns out this isn't what W2K8R2
-          does. It actually sends the STATUS_PENDING
-          message followed by the STATUS_SHARING_VIOLATION
-          message. Surely this means that all open
-          calls (even on directories) will potentially
-          fail in a chain.... ? And I've seen directory
-          opens as the start of a chain. JRA.
-
-          Update: 19th May 2010. Talking with Microsoft
-          engineers at the plugfest this is a bug in
-          Windows. Re-enable this code.
-       */
-       /*
-        * More subtlety. To match W2K8R2 don't
-        * send a "gone async" message if it's simply
-        * a STATUS_SHARING_VIOLATION (short) wait, not
-        * an oplock break wait. We do this by prematurely
-        * setting smb2req->async flag.
-        */
-       if (timeout.tv_sec < 2) {
-               DEBUG(10,("push_deferred_open_message_smb2: "
-                       "short timer wait (usec = %u). "
-                       "Don't send async message.\n",
-                       (unsigned int)timeout.tv_usec ));
-               smb2req->async = true;
-       }
-#endif
-
        /* Re-schedule us to retry on timer expiry. */
        end_time = timeval_sum(&request_time, &timeout);
 
@@ -1230,7 +1452,7 @@ bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
                                &end_time,
                                true) ));
 
-       state->te = event_add_timed(smb2req->sconn->smb2.event_ctx,
+       state->te = tevent_add_timer(smb2req->sconn->ev_ctx,
                                state,
                                end_time,
                                smb2_deferred_open_timer,