smbd: Don't pass lease_idx down to set_share_mode()
[gd/samba-autobuild/.git] / source3 / locking / locking.c
index 2e400ac8ef0e7b6468f553173018deee9cd9ca45..ddae920398683f6bb7135e16476723a9b1bda494 100644 (file)
@@ -37,6 +37,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "lib/util/server_id.h"
 #include "locking/proto.h"
 #include "smbd/globals.h"
 #include "dbwrap/dbwrap.h"
 #include "messages.h"
 #include "util_tdb.h"
 #include "../librpc/gen_ndr/ndr_open_files.h"
+#include "librpc/gen_ndr/ndr_file_id.h"
+#include "locking/leases_db.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_LOCKING
 
 #define NO_LOCKING_COUNT (-1)
 
-/* the locking database handle */
-static struct db_context *lock_db;
-
 /****************************************************************************
  Debugging aids :-).
 ****************************************************************************/
@@ -104,8 +104,9 @@ void init_strict_lock_struct(files_struct *fsp,
         plock->lock_flav = lp_posix_cifsu_locktype(fsp);
 }
 
-bool strict_lock_default(files_struct *fsp, struct lock_struct *plock)
+bool strict_lock_check_default(files_struct *fsp, struct lock_struct *plock)
 {
+       struct byte_range_lock *br_lck;
        int strict_locking = lp_strict_locking(fsp->conn->params);
        bool ret = False;
 
@@ -118,56 +119,52 @@ bool strict_lock_default(files_struct *fsp, struct lock_struct *plock)
        }
 
        if (strict_locking == Auto) {
-               if  (EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type) && (plock->lock_type == READ_LOCK || plock->lock_type == WRITE_LOCK)) {
-                       DEBUG(10,("is_locked: optimisation - exclusive oplock on file %s\n", fsp_str_dbg(fsp)));
-                       ret = True;
-               } else if ((fsp->oplock_type == LEVEL_II_OPLOCK) &&
-                          (plock->lock_type == READ_LOCK)) {
-                       DEBUG(10,("is_locked: optimisation - level II oplock on file %s\n", fsp_str_dbg(fsp)));
-                       ret = True;
-               } else {
-                       struct byte_range_lock *br_lck;
-
-                       br_lck = brl_get_locks_readonly(fsp);
-                       if (!br_lck) {
-                               return True;
-                       }
-                       ret = brl_locktest(br_lck,
-                                       plock->context.smblctx,
-                                       plock->context.pid,
-                                       plock->start,
-                                       plock->size,
-                                       plock->lock_type,
-                                       plock->lock_flav);
+               uint32_t lease_type = fsp_lease_type(fsp);
+
+               if ((lease_type & SMB2_LEASE_READ) &&
+                    (plock->lock_type == READ_LOCK))
+               {
+                       DBG_DEBUG("optimisation - read lease on file %s\n",
+                                 fsp_str_dbg(fsp));
+                       return true;
                }
-       } else {
-               struct byte_range_lock *br_lck;
 
-               br_lck = brl_get_locks_readonly(fsp);
-               if (!br_lck) {
-                       return True;
+               if ((lease_type & SMB2_LEASE_WRITE) &&
+                    (plock->lock_type == WRITE_LOCK))
+               {
+                       DBG_DEBUG("optimisation - write lease on file %s\n",
+                                 fsp_str_dbg(fsp));
+                       return true;
                }
-               ret = brl_locktest(br_lck,
-                               plock->context.smblctx,
-                               plock->context.pid,
-                               plock->start,
-                               plock->size,
-                               plock->lock_type,
-                               plock->lock_flav);
-       }
-
-       DEBUG(10,("strict_lock_default: flavour = %s brl start=%.0f "
-                       "len=%.0f %s for fnum %d file %s\n",
-                       lock_flav_name(plock->lock_flav),
-                       (double)plock->start, (double)plock->size,
-                       ret ? "unlocked" : "locked",
-                       plock->fnum, fsp_str_dbg(fsp)));
+       }
 
-       return ret;
-}
+       br_lck = brl_get_locks_readonly(fsp);
+       if (!br_lck) {
+               return true;
+       }
+       ret = brl_locktest(br_lck, plock);
 
-void strict_unlock_default(files_struct *fsp, struct lock_struct *plock)
-{
+       if (!ret) {
+               /*
+                * We got a lock conflict. Retry with rw locks to enable
+                * autocleanup. This is the slow path anyway.
+                */
+               br_lck = brl_get_locks(talloc_tos(), fsp);
+               if (br_lck == NULL) {
+                       return true;
+               }
+               ret = brl_locktest(br_lck, plock);
+               TALLOC_FREE(br_lck);
+       }
+
+       DEBUG(10, ("strict_lock_default: flavour = %s brl start=%ju "
+                  "len=%ju %s for fnum %ju file %s\n",
+                  lock_flav_name(plock->lock_flav),
+                  (uintmax_t)plock->start, (uintmax_t)plock->size,
+                  ret ? "unlocked" : "locked",
+                  (uintmax_t)plock->fnum, fsp_str_dbg(fsp)));
+
+       return ret;
 }
 
 /****************************************************************************
@@ -246,8 +243,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
                        enum brl_flavour lock_flav,
                        bool blocking_lock,
                        NTSTATUS *perr,
-                       uint64_t *psmblctx,
-                       struct blocking_lock_record *blr)
+                       uint64_t *psmblctx)
 {
        struct byte_range_lock *br_lck = NULL;
 
@@ -269,11 +265,11 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
 
        /* NOTE! 0 byte long ranges ARE allowed and should be stored  */
 
-       DEBUG(10,("do_lock: lock flavour %s lock type %s start=%.0f len=%.0f "
-               "blocking_lock=%s requested for fnum %d file %s\n",
+       DEBUG(10,("do_lock: lock flavour %s lock type %s start=%ju len=%ju "
+               "blocking_lock=%s requested for %s file %s\n",
                lock_flav_name(lock_flav), lock_type_name(lock_type),
-               (double)offset, (double)count, blocking_lock ? "true" :
-               "false", fsp->fnum, fsp_str_dbg(fsp)));
+               (uintmax_t)offset, (uintmax_t)count, blocking_lock ? "true" :
+               "false", fsp_fnum_dbg(fsp), fsp_str_dbg(fsp)));
 
        br_lck = brl_get_locks(talloc_tos(), fsp);
        if (!br_lck) {
@@ -290,8 +286,7 @@ struct byte_range_lock *do_lock(struct messaging_context *msg_ctx,
                        lock_type,
                        lock_flav,
                        blocking_lock,
-                       psmblctx,
-                       blr);
+                       psmblctx);
 
        DEBUG(10, ("do_lock: returning status=%s\n", nt_errstr(*perr)));
 
@@ -321,9 +316,9 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
                return NT_STATUS_OK;
        }
 
-       DEBUG(10,("do_unlock: unlock start=%.0f len=%.0f requested for fnum %d file %s\n",
-                 (double)offset, (double)count, fsp->fnum,
-                 fsp_str_dbg(fsp)));
+       DEBUG(10, ("do_unlock: unlock start=%ju len=%ju requested for %s file "
+                  "%s\n", (uintmax_t)offset, (uintmax_t)count,
+                  fsp_fnum_dbg(fsp), fsp_str_dbg(fsp)));
 
        br_lck = brl_get_locks(talloc_tos(), fsp);
        if (!br_lck) {
@@ -354,11 +349,10 @@ NTSTATUS do_unlock(struct messaging_context *msg_ctx,
 ****************************************************************************/
 
 NTSTATUS do_lock_cancel(files_struct *fsp,
-                       uint64 smblctx,
+                       uint64_t smblctx,
                        uint64_t count,
                        uint64_t offset,
-                       enum brl_flavour lock_flav,
-                       struct blocking_lock_record *blr)
+                       enum brl_flavour lock_flav)
 {
        bool ok = False;
        struct byte_range_lock *br_lck = NULL;
@@ -372,9 +366,9 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
                return NT_STATUS_DOS(ERRDOS, ERRcancelviolation);
        }
 
-       DEBUG(10,("do_lock_cancel: cancel start=%.0f len=%.0f requested for fnum %d file %s\n",
-                 (double)offset, (double)count, fsp->fnum,
-                 fsp_str_dbg(fsp)));
+       DEBUG(10, ("do_lock_cancel: cancel start=%ju len=%ju requested for "
+                  "%s file %s\n", (uintmax_t)offset, (uintmax_t)count,
+                  fsp_fnum_dbg(fsp), fsp_str_dbg(fsp)));
 
        br_lck = brl_get_locks(talloc_tos(), fsp);
        if (!br_lck) {
@@ -386,8 +380,7 @@ NTSTATUS do_lock_cancel(files_struct *fsp,
                        messaging_server_id(fsp->conn->sconn->msg_ctx),
                        offset,
                        count,
-                       lock_flav,
-                       blr);
+                       lock_flav);
 
        TALLOC_FREE(br_lck);
 
@@ -414,7 +407,7 @@ void locking_close_file(struct messaging_context *msg_ctx,
                return;
        }
 
-       /* If we have not outstanding locks or pending
+       /* If we have no outstanding locks or pending
         * locks then we don't need to look in the lock db.
         */
 
@@ -431,350 +424,39 @@ void locking_close_file(struct messaging_context *msg_ctx,
        }
 }
 
-/****************************************************************************
- Initialise the locking functions.
-****************************************************************************/
-
-static bool locking_init_internal(bool read_only)
-{
-       brl_init(read_only);
-
-       if (lock_db)
-               return True;
-
-       lock_db = db_open(NULL, lock_path("locking.tdb"),
-                         lp_open_files_db_hash_size(),
-                         TDB_DEFAULT|TDB_VOLATILE|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
-                         read_only?O_RDONLY:O_RDWR|O_CREAT, 0644);
-
-       if (!lock_db) {
-               DEBUG(0,("ERROR: Failed to initialise locking database\n"));
-               return False;
-       }
-
-       if (!posix_locking_init(read_only))
-               return False;
-
-       return True;
-}
-
-bool locking_init(void)
-{
-       return locking_init_internal(false);
-}
-
-bool locking_init_readonly(void)
-{
-       return locking_init_internal(true);
-}
-
-/*******************************************************************
- Deinitialize the share_mode management.
-******************************************************************/
-
-bool locking_end(void)
-{
-       brl_shutdown();
-       TALLOC_FREE(lock_db);
-       return true;
-}
-
-/*******************************************************************
- Form a static locking key for a dev/inode pair.
-******************************************************************/
-
-static TDB_DATA locking_key(const struct file_id *id, struct file_id *tmp)
-{
-       *tmp = *id;
-       return make_tdb_data((const uint8_t *)tmp, sizeof(*tmp));
-}
-
 /*******************************************************************
  Print out a share mode.
 ********************************************************************/
 
-char *share_mode_str(TALLOC_CTX *ctx, int num, const struct share_mode_entry *e)
+char *share_mode_str(TALLOC_CTX *ctx, int num,
+                    const struct file_id *id,
+                    const struct share_mode_entry *e)
 {
+       struct server_id_buf tmp;
+
        return talloc_asprintf(ctx, "share_mode_entry[%d]: "
                 "pid = %s, share_access = 0x%x, private_options = 0x%x, "
                 "access_mask = 0x%x, mid = 0x%llx, type= 0x%x, gen_id = %llu, "
                 "uid = %u, flags = %u, file_id %s, name_hash = 0x%x",
                 num,
-                procid_str_static(&e->pid),
+                server_id_str_buf(e->pid, &tmp),
                 e->share_access, e->private_options,
                 e->access_mask, (unsigned long long)e->op_mid,
                 e->op_type, (unsigned long long)e->share_file_id,
                 (unsigned int)e->uid, (unsigned int)e->flags,
-                file_id_string_tos(&e->id),
+                file_id_string_tos(id),
                 (unsigned int)e->name_hash);
 }
 
 /*******************************************************************
- Get all share mode entries for a dev/inode pair.
+ Fetch a share mode where we know one MUST exist. This call reference
+ counts it internally to allow for nested lock fetches.
 ********************************************************************/
 
-static struct share_mode_lock *parse_share_modes(TALLOC_CTX *mem_ctx,
-                                                const TDB_DATA dbuf)
-{
-       struct share_mode_lock *lck;
-       int i;
-       struct server_id *pids;
-       bool *pid_exists;
-       enum ndr_err_code ndr_err;
-       DATA_BLOB blob;
-
-       lck = talloc_zero(mem_ctx, struct share_mode_lock);
-       if (lck == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               goto fail;
-       }
-
-       blob.data = dbuf.dptr;
-       blob.length = dbuf.dsize;
-
-       ndr_err = ndr_pull_struct_blob(
-               &blob, lck, lck,
-               (ndr_pull_flags_fn_t)ndr_pull_share_mode_lock);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(1, ("ndr_pull_share_mode_lock failed\n"));
-               goto fail;
-       }
-
-       lck->modified = false;
-       lck->fresh = false;
-
-       if (DEBUGLEVEL >= 10) {
-               DEBUG(10, ("parse_share_modes:\n"));
-               NDR_PRINT_DEBUG(share_mode_lock, lck);
-       }
-
-       /*
-        * Ensure that each entry has a real process attached.
-        */
-
-       pids = talloc_array(talloc_tos(), struct server_id,
-                           lck->num_share_modes);
-       if (pids == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               goto fail;
-       }
-       pid_exists = talloc_array(talloc_tos(), bool, lck->num_share_modes);
-       if (pid_exists == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               goto fail;
-       }
-
-       for (i=0; i<lck->num_share_modes; i++) {
-               pids[i] = lck->share_modes[i].pid;
-       }
-       if (!serverids_exist(pids, lck->num_share_modes, pid_exists)) {
-               DEBUG(0, ("serverid_exists failed\n"));
-               goto fail;
-       }
-
-       i = 0;
-       while (i < lck->num_share_modes) {
-               struct share_mode_entry *e = &lck->share_modes[i];
-               if (!pid_exists[i]) {
-                       *e = lck->share_modes[lck->num_share_modes-1];
-                       lck->num_share_modes -= 1;
-                       lck->modified = True;
-                       continue;
-               }
-               i += 1;
-       }
-       TALLOC_FREE(pid_exists);
-       TALLOC_FREE(pids);
-       return lck;
-fail:
-       TALLOC_FREE(lck);
-       return NULL;
-}
-
-static TDB_DATA unparse_share_modes(struct share_mode_lock *lck)
-{
-       DATA_BLOB blob;
-       enum ndr_err_code ndr_err;
-
-       if (DEBUGLEVEL >= 10) {
-               DEBUG(10, ("unparse_share_modes:\n"));
-               NDR_PRINT_DEBUG(share_mode_lock, lck);
-       }
-
-       if (lck->num_share_modes == 0) {
-               DEBUG(10, ("No used share mode found\n"));
-               return make_tdb_data(NULL, 0);
-       }
-
-       ndr_err = ndr_push_struct_blob(
-               &blob, lck, lck,
-               (ndr_push_flags_fn_t)ndr_push_share_mode_lock);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               smb_panic("ndr_push_share_mode_lock failed");
-       }
-
-       return make_tdb_data(blob.data, blob.length);
-}
-
-static int share_mode_lock_destructor(struct share_mode_lock *lck)
-{
-       NTSTATUS status;
-       TDB_DATA data;
-
-       if (!lck->modified) {
-               return 0;
-       }
-
-       data = unparse_share_modes(lck);
-
-       if (data.dptr == NULL) {
-               if (!lck->fresh) {
-                       /* There has been an entry before, delete it */
-
-                       status = dbwrap_record_delete(lck->record);
-                       if (!NT_STATUS_IS_OK(status)) {
-                               char *errmsg;
-
-                               DEBUG(0, ("delete_rec returned %s\n",
-                                         nt_errstr(status)));
-
-                               if (asprintf(&errmsg, "could not delete share "
-                                            "entry: %s\n",
-                                            nt_errstr(status)) == -1) {
-                                       smb_panic("could not delete share"
-                                                 "entry");
-                               }
-                               smb_panic(errmsg);
-                       }
-               }
-               goto done;
-       }
-
-       status = dbwrap_record_store(lck->record, data, TDB_REPLACE);
-       if (!NT_STATUS_IS_OK(status)) {
-               char *errmsg;
-
-               DEBUG(0, ("store returned %s\n", nt_errstr(status)));
-
-               if (asprintf(&errmsg, "could not store share mode entry: %s",
-                            nt_errstr(status)) == -1) {
-                       smb_panic("could not store share mode entry");
-               }
-               smb_panic(errmsg);
-       }
-
- done:
-
-       return 0;
-}
-
-static struct share_mode_lock *fresh_share_mode_lock(
-       TALLOC_CTX *mem_ctx, const char *servicepath,
-       const struct smb_filename *smb_fname,
-       const struct timespec *old_write_time)
+struct share_mode_lock *get_existing_share_mode_lock(TALLOC_CTX *mem_ctx,
+                                                    const struct file_id id)
 {
-       struct share_mode_lock *lck;
-
-       if ((servicepath == NULL) || (smb_fname == NULL) ||
-           (old_write_time == NULL)) {
-               return NULL;
-       }
-
-       lck = talloc_zero(mem_ctx, struct share_mode_lock);
-       if (lck == NULL) {
-               goto fail;
-       }
-       lck->base_name = talloc_strdup(lck, smb_fname->base_name);
-       if (lck->base_name == NULL) {
-               goto fail;
-       }
-       if (smb_fname->stream_name != NULL) {
-               lck->stream_name = talloc_strdup(lck, smb_fname->stream_name);
-               if (lck->stream_name == NULL) {
-                       goto fail;
-               }
-       }
-       lck->servicepath = talloc_strdup(lck, servicepath);
-       if (lck->servicepath == NULL) {
-               goto fail;
-       }
-       lck->old_write_time = *old_write_time;
-       lck->modified = false;
-       lck->fresh = true;
-       return lck;
-fail:
-       DEBUG(0, ("talloc failed\n"));
-       TALLOC_FREE(lck);
-       return NULL;
-}
-
-struct share_mode_lock *get_share_mode_lock_fresh(TALLOC_CTX *mem_ctx,
-                                                 const struct file_id id,
-                                                 const char *servicepath,
-                                                 const struct smb_filename *smb_fname,
-                                                 const struct timespec *old_write_time)
-{
-       struct share_mode_lock *lck;
-       struct file_id tmp;
-       struct db_record *rec;
-       TDB_DATA key = locking_key(&id, &tmp);
-       TDB_DATA value;
-
-       rec = dbwrap_fetch_locked(lock_db, mem_ctx, key);
-       if (rec == NULL) {
-               DEBUG(3, ("Could not lock share entry\n"));
-               return NULL;
-       }
-
-       value = dbwrap_record_get_value(rec);
-
-       if (value.dptr == NULL) {
-               lck = fresh_share_mode_lock(mem_ctx, servicepath, smb_fname,
-                                           old_write_time);
-       } else {
-               lck = parse_share_modes(mem_ctx, value);
-       }
-
-       if (lck == NULL) {
-               DEBUG(1, ("Could not get share mode lock\n"));
-               TALLOC_FREE(rec);
-               return NULL;
-       }
-       lck->id = id;
-       lck->record = talloc_move(lck, &rec);
-       talloc_set_destructor(lck, share_mode_lock_destructor);
-       return lck;
-}
-
-struct share_mode_lock *get_share_mode_lock(TALLOC_CTX *mem_ctx,
-                                           const struct file_id id)
-{
-       return get_share_mode_lock_fresh(mem_ctx, id, NULL, NULL, NULL);
-}
-
-struct share_mode_lock *fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
-                                                 const struct file_id id)
-{
-       struct share_mode_lock *lck;
-       struct file_id tmp;
-       TDB_DATA key = locking_key(&id, &tmp);
-       TDB_DATA data;
-       NTSTATUS status;
-
-       status = dbwrap_fetch(lock_db, talloc_tos(), key, &data);
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(3, ("Could not fetch share entry\n"));
-               return NULL;
-       }
-       if (data.dptr == NULL) {
-               return NULL;
-       }
-       lck = parse_share_modes(mem_ctx, data);
-       if (lck != NULL) {
-               lck->id = id;
-       }
-       TALLOC_FREE(data.dptr);
-       return lck;
+       return get_share_mode_lock(mem_ctx, id, NULL, NULL, NULL);
 }
 
 /*******************************************************************
@@ -786,19 +468,22 @@ struct share_mode_lock *fetch_share_mode_unlocked(TALLOC_CTX *mem_ctx,
 
 bool rename_share_filename(struct messaging_context *msg_ctx,
                        struct share_mode_lock *lck,
+                       struct file_id id,
                        const char *servicepath,
                        uint32_t orig_name_hash,
                        uint32_t new_name_hash,
                        const struct smb_filename *smb_fname_dst)
 {
+       struct share_mode_data *d = lck->data;
        size_t sp_len;
        size_t bn_len;
        size_t sn_len;
        size_t msg_len;
        char *frm = NULL;
-       int i;
+       uint32_t i;
        bool strip_two_chars = false;
        bool has_stream = smb_fname_dst->stream_name != NULL;
+       struct server_id self_pid = messaging_server_id(msg_ctx);
 
        DEBUG(10, ("rename_share_filename: servicepath %s newname %s\n",
                   servicepath, smb_fname_dst->base_name));
@@ -814,48 +499,50 @@ bool rename_share_filename(struct messaging_context *msg_ctx,
                strip_two_chars = true;
        }
 
-       lck->servicepath = talloc_strdup(lck, servicepath);
-       lck->base_name = talloc_strdup(lck, smb_fname_dst->base_name +
+       d->servicepath = talloc_strdup(d, servicepath);
+       d->base_name = talloc_strdup(d, smb_fname_dst->base_name +
                                       (strip_two_chars ? 2 : 0));
-       lck->stream_name = talloc_strdup(lck, smb_fname_dst->stream_name);
-       if (lck->base_name == NULL ||
-           (has_stream && lck->stream_name == NULL) ||
-           lck->servicepath == NULL) {
+       d->stream_name = talloc_strdup(d, smb_fname_dst->stream_name);
+       if (d->base_name == NULL ||
+           (has_stream && d->stream_name == NULL) ||
+           d->servicepath == NULL) {
                DEBUG(0, ("rename_share_filename: talloc failed\n"));
                return False;
        }
-       lck->modified = True;
+       d->modified = True;
 
-       sp_len = strlen(lck->servicepath);
-       bn_len = strlen(lck->base_name);
-       sn_len = has_stream ? strlen(lck->stream_name) : 0;
+       sp_len = strlen(d->servicepath);
+       bn_len = strlen(d->base_name);
+       sn_len = has_stream ? strlen(d->stream_name) : 0;
 
        msg_len = MSG_FILE_RENAMED_MIN_SIZE + sp_len + 1 + bn_len + 1 +
            sn_len + 1;
 
        /* Set up the name changed message. */
-       frm = talloc_array(lck, char, msg_len);
+       frm = talloc_array(d, char, msg_len);
        if (!frm) {
                return False;
        }
 
-       push_file_id_24(frm, &lck->id);
+       push_file_id_24(frm, &id);
 
        DEBUG(10,("rename_share_filename: msg_len = %u\n", (unsigned int)msg_len ));
 
        strlcpy(&frm[24],
-               lck->servicepath ? lck->servicepath : "",
+               d->servicepath ? d->servicepath : "",
                sp_len+1);
        strlcpy(&frm[24 + sp_len + 1],
-               lck->base_name ? lck->base_name : "",
+               d->base_name ? d->base_name : "",
                bn_len+1);
        strlcpy(&frm[24 + sp_len + 1 + bn_len + 1],
-               lck->stream_name ? lck->stream_name : "",
+               d->stream_name ? d->stream_name : "",
                sn_len+1);
 
        /* Send the messages. */
-       for (i=0; i<lck->num_share_modes; i++) {
-               struct share_mode_entry *se = &lck->share_modes[i];
+       for (i=0; i<d->num_share_modes; i++) {
+               struct share_mode_entry *se = &d->share_modes[i];
+               struct server_id_buf tmp;
+
                if (!is_valid_share_mode_entry(se)) {
                        continue;
                }
@@ -869,20 +556,48 @@ bool rename_share_filename(struct messaging_context *msg_ctx,
                se->name_hash = new_name_hash;
 
                /* But not to ourselves... */
-               if (procid_is_me(&se->pid)) {
+               if (serverid_equal(&se->pid, &self_pid)) {
+                       continue;
+               }
+
+               if (share_mode_stale_pid(d, i)) {
                        continue;
                }
 
                DEBUG(10,("rename_share_filename: sending rename message to "
                          "pid %s file_id %s sharepath %s base_name %s "
                          "stream_name %s\n",
-                         procid_str_static(&se->pid),
-                         file_id_string_tos(&lck->id),
-                         lck->servicepath, lck->base_name,
-                       has_stream ? lck->stream_name : ""));
+                         server_id_str_buf(se->pid, &tmp),
+                         file_id_string_tos(&id),
+                         d->servicepath, d->base_name,
+                       has_stream ? d->stream_name : ""));
 
                messaging_send_buf(msg_ctx, se->pid, MSG_SMB_FILE_RENAME,
-                                  (uint8 *)frm, msg_len);
+                                  (uint8_t *)frm, msg_len);
+       }
+
+       for (i=0; i<d->num_leases; i++) {
+               /* Update the filename in leases_db. */
+               NTSTATUS status;
+               struct share_mode_lease *l;
+
+               l = &d->leases[i];
+
+               status = leases_db_rename(&l->client_guid,
+                                       &l->lease_key,
+                                       &id,
+                                       d->servicepath,
+                                       d->base_name,
+                                       d->stream_name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       /* Any error recovery possible here ? */
+                       DEBUG(1,("Failed to rename lease key for "
+                               "renamed file %s:%s. %s\n",
+                               d->base_name,
+                               d->stream_name,
+                               nt_errstr(status)));
+                       continue;
+               }
        }
 
        return True;
@@ -912,14 +627,7 @@ void get_file_infos(struct file_id id,
        }
 
        if (write_time) {
-               struct timespec wt;
-
-               wt = lck->changed_write_time;
-               if (null_timespec(wt)) {
-                       wt = lck->old_write_time;
-               }
-
-               *write_time = wt;
+               *write_time = get_share_mode_write_time(lck);
        }
 
        TALLOC_FREE(lck);
@@ -929,27 +637,202 @@ bool is_valid_share_mode_entry(const struct share_mode_entry *e)
 {
        int num_props = 0;
 
+       if (e->stale) {
+               return false;
+       }
+
        num_props += ((e->op_type == NO_OPLOCK) ? 1 : 0);
        num_props += (EXCLUSIVE_OPLOCK_TYPE(e->op_type) ? 1 : 0);
        num_props += (LEVEL_II_OPLOCK_TYPE(e->op_type) ? 1 : 0);
+       num_props += (e->op_type == LEASE_OPLOCK);
 
-       SMB_ASSERT(num_props <= 1);
+       if ((num_props > 1) && serverid_exists(&e->pid)) {
+               smb_panic("Invalid share mode entry");
+       }
        return (num_props != 0);
 }
 
-bool is_deferred_open_entry(const struct share_mode_entry *e)
+/*
+ * See if we need to remove a lease being referred to by a
+ * share mode that is being marked stale or deleted.
+ */
+
+static void remove_share_mode_lease(struct share_mode_data *d,
+                                   struct share_mode_entry *e)
+{
+       uint16_t op_type;
+       uint32_t lease_idx;
+       uint32_t i;
+
+       op_type = e->op_type;
+       e->op_type = NO_OPLOCK;
+
+       d->modified = true;
+
+       if (op_type != LEASE_OPLOCK) {
+               return;
+       }
+
+       /*
+        * This used to reference a lease. If there's no other one referencing
+        * it, remove it.
+        */
+
+       lease_idx = e->lease_idx;
+       e->lease_idx = UINT32_MAX;
+
+       for (i=0; i<d->num_share_modes; i++) {
+               struct share_mode_entry *e2 = &d->share_modes[i];
+
+               if (e2->stale) {
+                       continue;
+               }
+               if (e == e2) {
+                       /* Not ourselves. */
+                       continue;
+               }
+               if (smb2_lease_equal(&e->client_guid,
+                                    &e->lease_key,
+                                    &e2->client_guid,
+                                    &e2->lease_key)) {
+                       break;
+               }
+       }
+       if (i < d->num_share_modes) {
+               /*
+                * Found another one
+                */
+               return;
+       }
+
+       d->num_leases -= 1;
+       d->leases[lease_idx] = d->leases[d->num_leases];
+
+       /*
+        * We changed the lease array. Fix all references to it.
+        */
+       for (i=0; i<d->num_share_modes; i++) {
+               if (d->share_modes[i].lease_idx == d->num_leases) {
+                       d->share_modes[i].lease_idx = lease_idx;
+               }
+       }
+
+       {
+               NTSTATUS status;
+
+               status = leases_db_del(&e->client_guid,
+                                      &e->lease_key,
+                                      &d->id);
+
+               DEBUG(10, ("%s: leases_db_del returned %s\n", __func__,
+                          nt_errstr(status)));
+       }
+}
+
+/*
+ * In case d->share_modes[i] conflicts with something or otherwise is
+ * being used, we need to make sure the corresponding process still
+ * exists.
+ */
+bool share_mode_stale_pid(struct share_mode_data *d, uint32_t idx)
 {
-       return (e->op_type == DEFERRED_OPEN_ENTRY);
+       struct server_id_buf tmp;
+       struct share_mode_entry *e;
+
+       if (idx > d->num_share_modes) {
+               DBG_WARNING("Asking for index %"PRIu32", "
+                           "only %"PRIu32" around\n",
+                           idx,
+                           d->num_share_modes);
+               return false;
+       }
+       e = &d->share_modes[idx];
+       if (e->stale) {
+               /*
+                * Checked before
+                */
+               return true;
+       }
+       if (serverid_exists(&e->pid)) {
+               DBG_DEBUG("PID %s (index %"PRIu32" out of %"PRIu32") "
+                         "still exists\n",
+                         server_id_str_buf(e->pid, &tmp),
+                         idx,
+                         d->num_share_modes);
+               return false;
+       }
+       DBG_DEBUG("PID %s (index %"PRIu32" out of %"PRIu32") "
+                 "does not exist anymore\n",
+                 server_id_str_buf(e->pid, &tmp),
+                 idx,
+                 d->num_share_modes);
+
+       e->stale = true;
+
+       if (d->num_delete_tokens != 0) {
+               uint32_t i;
+
+               for (i=0; i<d->num_share_modes; i++) {
+                       bool valid = !d->share_modes[i].stale;
+                       if (valid) {
+                               break;
+                       }
+               }
+
+               if (i == d->num_share_modes) {
+                       /*
+                        * No valid (non-stale) share mode found, all
+                        * who might have set the delete token are
+                        * gone.
+                        */
+                       TALLOC_FREE(d->delete_tokens);
+                       d->num_delete_tokens = 0;
+               }
+       }
+
+       remove_share_mode_lease(d, e);
+
+       d->modified = true;
+       return true;
 }
 
-/*******************************************************************
- Fill a share mode entry.
-********************************************************************/
+void remove_stale_share_mode_entries(struct share_mode_data *d)
+{
+       uint32_t i;
 
-static void fill_share_mode_entry(struct share_mode_entry *e,
-                                 files_struct *fsp,
-                                 uid_t uid, uint64_t mid, uint16 op_type)
+       i = 0;
+       while (i < d->num_share_modes) {
+               if (d->share_modes[i].stale) {
+                       struct share_mode_entry *m = d->share_modes;
+                       m[i] = m[d->num_share_modes-1];
+                       d->num_share_modes -= 1;
+                       continue;
+               }
+               i += 1;
+       }
+}
+
+bool set_share_mode(struct share_mode_lock *lck,
+                   struct files_struct *fsp,
+                   uid_t uid,
+                   uint64_t mid,
+                   uint16_t op_type,
+                   const struct GUID *client_guid,
+                   const struct smb2_lease_key *lease_key)
 {
+       struct share_mode_data *d = lck->data;
+       struct share_mode_entry *tmp, *e;
+
+       tmp = talloc_realloc(d, d->share_modes, struct share_mode_entry,
+                            d->num_share_modes+1);
+       if (tmp == NULL) {
+               return false;
+       }
+       d->share_modes = tmp;
+       e = &d->share_modes[d->num_share_modes];
+       d->num_share_modes += 1;
+       d->modified = true;
+
        ZERO_STRUCTP(e);
        e->pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
        e->share_access = fsp->share_access;
@@ -957,142 +840,130 @@ static void fill_share_mode_entry(struct share_mode_entry *e,
        e->access_mask = fsp->access_mask;
        e->op_mid = mid;
        e->op_type = op_type;
+
+       if (op_type == LEASE_OPLOCK) {
+               uint32_t i;
+
+               e->client_guid = *client_guid;
+               e->lease_key = *lease_key;
+
+               /*
+                * Need to set lease_idx. This is essentially
+                * find_share_mode_lease(), but that will go away
+                * soon. So don't add the dependency here.
+                */
+
+               for (i=0; i<d->num_leases; i++) {
+                       struct share_mode_lease *l = &d->leases[i];
+
+                       if (smb2_lease_equal(client_guid,
+                                            lease_key,
+                                            &l->client_guid,
+                                            &l->lease_key)) {
+                               break;
+                       }
+               }
+
+               if (i == d->num_leases) {
+                       DBG_WARNING("lease not found\n");
+                       d->num_share_modes -= 1;
+                       return false;
+               }
+
+               e->lease_idx = i;
+       } else {
+               e->lease_idx = UINT32_MAX;
+       }
+
        e->time.tv_sec = fsp->open_time.tv_sec;
        e->time.tv_usec = fsp->open_time.tv_usec;
-       e->id = fsp->file_id;
        e->share_file_id = fsp->fh->gen_id;
-       e->uid = (uint32)uid;
-       e->flags = fsp->posix_open ? SHARE_MODE_FLAG_POSIX_OPEN : 0;
+       e->uid = (uint32_t)uid;
+       e->flags = (fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) ?
+               SHARE_MODE_FLAG_POSIX_OPEN : 0;
        e->name_hash = fsp->name_hash;
-}
-
-static void fill_deferred_open_entry(struct share_mode_entry *e,
-                                    const struct timeval request_time,
-                                    struct file_id id,
-                                    struct server_id pid,
-                                    uint64_t mid)
-{
-       ZERO_STRUCTP(e);
-       e->pid = pid;
-       e->op_mid = mid;
-       e->op_type = DEFERRED_OPEN_ENTRY;
-       e->time.tv_sec = request_time.tv_sec;
-       e->time.tv_usec = request_time.tv_usec;
-       e->id = id;
-       e->uid = (uint32)-1;
-       e->flags = 0;
-}
-
-static void add_share_mode_entry(struct share_mode_lock *lck,
-                                const struct share_mode_entry *entry)
-{
-       ADD_TO_ARRAY(lck, struct share_mode_entry, *entry,
-                    &lck->share_modes, &lck->num_share_modes);
-       lck->modified = True;
-}
 
-void set_share_mode(struct share_mode_lock *lck, files_struct *fsp,
-                   uid_t uid, uint64_t mid, uint16 op_type)
-{
-       struct share_mode_entry entry;
-       fill_share_mode_entry(&entry, fsp, uid, mid, op_type);
-       add_share_mode_entry(lck, &entry);
+       return true;
 }
 
-void add_deferred_open(struct share_mode_lock *lck, uint64_t mid,
-                      struct timeval request_time,
-                      struct server_id pid, struct file_id id)
+struct share_mode_entry *find_share_mode_entry(
+       struct share_mode_lock *lck, files_struct *fsp)
 {
-       struct share_mode_entry entry;
-       fill_deferred_open_entry(&entry, request_time, id, pid, mid);
-       add_share_mode_entry(lck, &entry);
-}
-
-/*******************************************************************
- Check if two share mode entries are identical, ignoring oplock 
- and mid info and desired_access. (Removed paranoia test - it's
- not automatically a logic error if they are identical. JRA.)
-********************************************************************/
+       struct share_mode_data *d = lck->data;
+       struct server_id pid;
+       uint32_t i;
 
-static bool share_modes_identical(struct share_mode_entry *e1,
-                                 struct share_mode_entry *e2)
-{
-       /* We used to check for e1->share_access == e2->share_access here
-          as well as the other fields but 2 different DOS or FCB opens
-          sharing the same share mode entry may validly differ in
-          fsp->share_access field. */
-
-       return (procid_equal(&e1->pid, &e2->pid) &&
-               file_id_equal(&e1->id, &e2->id) &&
-               e1->share_file_id == e2->share_file_id );
-}
+       pid = messaging_server_id(fsp->conn->sconn->msg_ctx);
 
-static bool deferred_open_identical(struct share_mode_entry *e1,
-                                   struct share_mode_entry *e2)
-{
-       return (procid_equal(&e1->pid, &e2->pid) &&
-               (e1->op_mid == e2->op_mid) &&
-               file_id_equal(&e1->id, &e2->id));
-}
+       for (i=0; i<d->num_share_modes; i++) {
+               struct share_mode_entry *e = &d->share_modes[i];
 
-static struct share_mode_entry *find_share_mode_entry(struct share_mode_lock *lck,
-                                                     struct share_mode_entry *entry)
-{
-       int i;
-
-       for (i=0; i<lck->num_share_modes; i++) {
-               struct share_mode_entry *e = &lck->share_modes[i];
-               if (is_valid_share_mode_entry(entry) &&
-                   is_valid_share_mode_entry(e) &&
-                   share_modes_identical(e, entry)) {
-                       return e;
+               if (!is_valid_share_mode_entry(e)) {
+                       continue;
                }
-               if (is_deferred_open_entry(entry) &&
-                   is_deferred_open_entry(e) &&
-                   deferred_open_identical(e, entry)) {
-                       return e;
+               if (!serverid_equal(&pid, &e->pid)) {
+                       continue;
+               }
+               if (fsp->fh->gen_id != e->share_file_id) {
+                       continue;
                }
+               return e;
        }
        return NULL;
 }
 
 /*******************************************************************
- Del the share mode of a file for this process. Return the number of
- entries left.
+ Del the share mode of a file for this process.
 ********************************************************************/
 
 bool del_share_mode(struct share_mode_lock *lck, files_struct *fsp)
 {
-       struct share_mode_entry entry, *e;
+       struct share_mode_entry *e;
 
-       /* Don't care about the pid owner being correct here - just a search. */
-       fill_share_mode_entry(&entry, fsp, (uid_t)-1, 0, NO_OPLOCK);
-
-       e = find_share_mode_entry(lck, &entry);
+       e = find_share_mode_entry(lck, fsp);
        if (e == NULL) {
                return False;
        }
-       *e = lck->share_modes[lck->num_share_modes-1];
-       lck->num_share_modes -= 1;
-       lck->modified = True;
+       remove_share_mode_lease(lck->data, e);
+       *e = lck->data->share_modes[lck->data->num_share_modes-1];
+       lck->data->num_share_modes -= 1;
+       lck->data->modified = True;
        return True;
 }
 
-void del_deferred_open_entry(struct share_mode_lock *lck, uint64_t mid,
-                            struct server_id pid)
+bool mark_share_mode_disconnected(struct share_mode_lock *lck,
+                                 struct files_struct *fsp)
 {
-       struct share_mode_entry entry, *e;
+       struct share_mode_entry *e;
+
+       if (lck->data->num_share_modes != 1) {
+               return false;
+       }
 
-       fill_deferred_open_entry(&entry, timeval_zero(),
-                                lck->id, pid, mid);
+       if (fsp->op == NULL) {
+               return false;
+       }
+       if (!fsp->op->global->durable) {
+               return false;
+       }
 
-       e = find_share_mode_entry(lck, &entry);
+       e = find_share_mode_entry(lck, fsp);
        if (e == NULL) {
-               return;
+               return false;
        }
-       *e = lck->share_modes[lck->num_share_modes-1];
-       lck->num_share_modes -= 1;
-       lck->modified = True;
+
+       DEBUG(10, ("Marking share mode entry disconnected for durable handle\n"));
+
+       server_id_set_disconnected(&e->pid);
+
+       /*
+        * On reopen the caller needs to check that
+        * the client comes with the correct handle.
+        */
+       e->share_file_id = fsp->op->global->open_persistent_id;
+
+       lck->data->modified = true;
+       return true;
 }
 
 /*******************************************************************
@@ -1101,31 +972,17 @@ void del_deferred_open_entry(struct share_mode_lock *lck, uint64_t mid,
 
 bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 {
-       struct share_mode_entry entry, *e;
-
-       /* Don't care about the pid owner being correct here - just a search. */
-       fill_share_mode_entry(&entry, fsp, (uid_t)-1, 0, NO_OPLOCK);
+       struct share_mode_data *d = lck->data;
+       struct share_mode_entry *e;
 
-       e = find_share_mode_entry(lck, &entry);
+       e = find_share_mode_entry(lck, fsp);
        if (e == NULL) {
                return False;
        }
 
-       if (EXCLUSIVE_OPLOCK_TYPE(e->op_type)) {
-               /*
-                * Going from exclusive or batch,
-                * we always go through FAKE_LEVEL_II
-                * first.
-                */
-               if (!EXCLUSIVE_OPLOCK_TYPE(fsp->oplock_type)) {
-                       smb_panic("remove_share_oplock: logic error");
-               }
-               e->op_type = FAKE_LEVEL_II_OPLOCK;
-       } else {
-               e->op_type = NO_OPLOCK;
-       }
-       lck->modified = True;
-       return True;
+       remove_share_mode_lease(d, e);
+       d->modified = True;
+       return true;
 }
 
 /*******************************************************************
@@ -1134,78 +991,72 @@ bool remove_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 
 bool downgrade_share_oplock(struct share_mode_lock *lck, files_struct *fsp)
 {
-       struct share_mode_entry entry, *e;
-
-       /* Don't care about the pid owner being correct here - just a search. */
-       fill_share_mode_entry(&entry, fsp, (uid_t)-1, 0, NO_OPLOCK);
+       struct share_mode_entry *e;
 
-       e = find_share_mode_entry(lck, &entry);
+       e = find_share_mode_entry(lck, fsp);
        if (e == NULL) {
                return False;
        }
 
        e->op_type = LEVEL_II_OPLOCK;
-       lck->modified = True;
+       lck->data->modified = True;
        return True;
 }
 
-/*************************************************************************
- Return a talloced copy of a struct security_unix_token. NULL on fail.
- (Should this be in locking.c.... ?).
-*************************************************************************/
-
-static struct security_unix_token *copy_unix_token(TALLOC_CTX *ctx, const struct security_unix_token *tok)
-{
-       struct security_unix_token *cpy;
-
-       cpy = talloc(ctx, struct security_unix_token);
-       if (!cpy) {
-               return NULL;
-       }
-
-       cpy->uid = tok->uid;
-       cpy->gid = tok->gid;
-       cpy->ngroups = tok->ngroups;
-       if (tok->ngroups) {
-               /* Make this a talloc child of cpy. */
-               cpy->groups = (gid_t *)talloc_memdup(
-                       cpy, tok->groups, tok->ngroups * sizeof(gid_t));
-               if (!cpy->groups) {
-                       TALLOC_FREE(cpy);
-                       return NULL;
-               }
-       }
-       return cpy;
-}
-
 /****************************************************************************
  Adds a delete on close token.
 ****************************************************************************/
 
-static bool add_delete_on_close_token(struct share_mode_lock *lck,
+static bool add_delete_on_close_token(struct share_mode_data *d,
                        uint32_t name_hash,
+                       const struct security_token *nt_tok,
                        const struct security_unix_token *tok)
 {
        struct delete_token *tmp, *dtl;
 
-       tmp = talloc_realloc(lck, lck->delete_tokens, struct delete_token,
-                            lck->num_delete_tokens+1);
+       tmp = talloc_realloc(d, d->delete_tokens, struct delete_token,
+                            d->num_delete_tokens+1);
        if (tmp == NULL) {
                return false;
        }
-       lck->delete_tokens = tmp;
-       dtl = &lck->delete_tokens[lck->num_delete_tokens];
+       d->delete_tokens = tmp;
+       dtl = &d->delete_tokens[d->num_delete_tokens];
 
        dtl->name_hash = name_hash;
-       dtl->delete_token = copy_unix_token(lck->delete_tokens, tok);
+       dtl->delete_nt_token = dup_nt_token(d->delete_tokens, nt_tok);
+       if (dtl->delete_nt_token == NULL) {
+               return false;
+       }
+       dtl->delete_token = copy_unix_token(d->delete_tokens, tok);
        if (dtl->delete_token == NULL) {
                return false;
        }
-       lck->num_delete_tokens += 1;
-       lck->modified = true;
+       d->num_delete_tokens += 1;
+       d->modified = true;
        return true;
 }
 
+void reset_delete_on_close_lck(files_struct *fsp,
+                              struct share_mode_lock *lck)
+{
+       struct share_mode_data *d = lck->data;
+       uint32_t i;
+
+       for (i=0; i<d->num_delete_tokens; i++) {
+               struct delete_token *dt = &d->delete_tokens[i];
+
+               if (dt->name_hash == fsp->name_hash) {
+                       d->modified = true;
+
+                       /* Delete this entry. */
+                       TALLOC_FREE(dt->delete_nt_token);
+                       TALLOC_FREE(dt->delete_token);
+                       *dt = d->delete_tokens[d->num_delete_tokens-1];
+                       d->num_delete_tokens -= 1;
+               }
+       }
+}
+
 /****************************************************************************
  Sets the delete on close flag over all share modes on this file.
  Modify the share mode entry for all files open
@@ -1219,63 +1070,86 @@ static bool add_delete_on_close_token(struct share_mode_lock *lck,
 
 void set_delete_on_close_lck(files_struct *fsp,
                        struct share_mode_lock *lck,
-                       bool delete_on_close,
+                       const struct security_token *nt_tok,
                        const struct security_unix_token *tok)
 {
-       int i;
+       struct messaging_context *msg_ctx = fsp->conn->sconn->msg_ctx;
+       struct share_mode_data *d = lck->data;
+       uint32_t i;
        bool ret;
+       DATA_BLOB fid_blob = {};
+       enum ndr_err_code ndr_err;
 
-       if (delete_on_close) {
-               SMB_ASSERT(tok != NULL);
-       } else {
-               SMB_ASSERT(tok == NULL);
-       }
+       SMB_ASSERT(nt_tok != NULL);
+       SMB_ASSERT(tok != NULL);
 
-       for (i=0; i<lck->num_delete_tokens; i++) {
-               struct delete_token *dt = &lck->delete_tokens[i];
+       for (i=0; i<d->num_delete_tokens; i++) {
+               struct delete_token *dt = &d->delete_tokens[i];
                if (dt->name_hash == fsp->name_hash) {
-                       lck->modified = true;
-                       if (delete_on_close == false) {
-                               /* Delete this entry. */
-                               TALLOC_FREE(dt->delete_token);
-                               *dt = lck->delete_tokens[
-                                       lck->num_delete_tokens-1];
-                               lck->num_delete_tokens -= 1;
-                               return;
-                       }
-                       /* Replace this token with the
-                          given tok. */
+                       d->modified = true;
+
+                       /* Replace this token with the given tok. */
+                       TALLOC_FREE(dt->delete_nt_token);
+                       dt->delete_nt_token = dup_nt_token(dt, nt_tok);
+                       SMB_ASSERT(dt->delete_nt_token != NULL);
                        TALLOC_FREE(dt->delete_token);
                        dt->delete_token = copy_unix_token(dt, tok);
                        SMB_ASSERT(dt->delete_token != NULL);
+
+                       return;
                }
        }
 
-       if (!delete_on_close) {
-               /* Nothing to delete - not found. */
-               return;
+       ret = add_delete_on_close_token(lck->data, fsp->name_hash, nt_tok, tok);
+       SMB_ASSERT(ret);
+
+       ndr_err = ndr_push_struct_blob(&fid_blob, talloc_tos(), &fsp->file_id,
+                                      (ndr_push_flags_fn_t)ndr_push_file_id);
+       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+               DEBUG(10, ("ndr_push_file_id failed: %s\n",
+                          ndr_errstr(ndr_err)));
        }
 
-       ret = add_delete_on_close_token(lck, fsp->name_hash, tok);
-       SMB_ASSERT(ret);
+       for (i=0; i<d->num_share_modes; i++) {
+               struct share_mode_entry *e = &d->share_modes[i];
+               NTSTATUS status;
+
+               status = messaging_send(
+                       msg_ctx, e->pid, MSG_SMB_NOTIFY_CANCEL_DELETED,
+                       &fid_blob);
+
+               if (!NT_STATUS_IS_OK(status)) {
+                       struct server_id_buf tmp;
+                       DEBUG(10, ("%s: messaging_send to %s returned %s\n",
+                                  __func__, server_id_str_buf(e->pid, &tmp),
+                                  nt_errstr(status)));
+               }
+       }
+
+       TALLOC_FREE(fid_blob.data);
 }
 
-bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const struct security_unix_token *tok)
+bool set_delete_on_close(files_struct *fsp, bool delete_on_close,
+                       const struct security_token *nt_tok,
+                       const struct security_unix_token *tok)
 {
        struct share_mode_lock *lck;
 
        DEBUG(10,("set_delete_on_close: %s delete on close flag for "
-                 "fnum = %d, file %s\n",
-                 delete_on_close ? "Adding" : "Removing", fsp->fnum,
+                 "%s, file %s\n",
+                 delete_on_close ? "Adding" : "Removing", fsp_fnum_dbg(fsp),
                  fsp_str_dbg(fsp)));
 
-       lck = get_share_mode_lock(talloc_tos(), fsp->file_id);
+       lck = get_existing_share_mode_lock(talloc_tos(), fsp->file_id);
        if (lck == NULL) {
                return False;
        }
 
-       set_delete_on_close_lck(fsp, lck, delete_on_close,
-                       delete_on_close ? tok : NULL);
+       if (delete_on_close) {
+               set_delete_on_close_lck(fsp, lck, nt_tok, tok);
+       } else {
+               reset_delete_on_close_lck(fsp, lck);
+       }
 
        if (fsp->is_directory) {
                SMB_ASSERT(!is_ntfs_stream_smb_fname(fsp->fsp_name));
@@ -1290,27 +1164,50 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const struct s
        return True;
 }
 
-const struct security_unix_token *get_delete_on_close_token(struct share_mode_lock *lck, uint32_t name_hash)
+static struct delete_token *find_delete_on_close_token(
+       struct share_mode_data *d, uint32_t name_hash)
 {
-       int i;
+       uint32_t i;
+
+       DEBUG(10, ("find_delete_on_close_token: name_hash = 0x%x\n",
+                  (unsigned int)name_hash));
 
-       DEBUG(10,("get_delete_on_close_token: name_hash = 0x%x\n",
-                       (unsigned int)name_hash ));
+       for (i=0; i<d->num_delete_tokens; i++) {
+               struct delete_token *dt = &d->delete_tokens[i];
 
-       for (i=0; i<lck->num_delete_tokens; i++) {
-               struct delete_token *dt = &lck->delete_tokens[i];
-               DEBUG(10,("get_delete_on_close_token: dtl->name_hash = 0x%x\n",
-                               (unsigned int)dt->name_hash ));
+               DEBUG(10, ("find__delete_on_close_token: dt->name_hash = 0x%x\n",
+                          (unsigned int)dt->name_hash ));
                if (dt->name_hash == name_hash) {
-                       return dt->delete_token;
+                       return dt;
                }
        }
        return NULL;
 }
 
+/****************************************************************************
+ Return the NT token and UNIX token if there's a match. Return true if
+ found, false if not.
+****************************************************************************/
+
+bool get_delete_on_close_token(struct share_mode_lock *lck,
+                                       uint32_t name_hash,
+                                       const struct security_token **pp_nt_tok,
+                                       const struct security_unix_token **pp_tok)
+{
+       struct delete_token *dt;
+
+       dt = find_delete_on_close_token(lck->data, name_hash);
+       if (dt == NULL) {
+               return false;
+       }
+       *pp_nt_tok = dt->delete_nt_token;
+       *pp_tok =  dt->delete_token;
+       return true;
+}
+
 bool is_delete_on_close_set(struct share_mode_lock *lck, uint32_t name_hash)
 {
-       return (get_delete_on_close_token(lck, name_hash) != NULL);
+       return find_delete_on_close_token(lck->data, name_hash) != NULL;
 }
 
 bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)
@@ -1322,14 +1219,14 @@ bool set_sticky_write_time(struct file_id fileid, struct timespec write_time)
                            convert_timespec_to_time_t(write_time)),
                 file_id_string_tos(&fileid)));
 
-       lck = get_share_mode_lock(talloc_tos(), fileid);
+       lck = get_existing_share_mode_lock(talloc_tos(), fileid);
        if (lck == NULL) {
                return False;
        }
 
-       if (timespec_compare(&lck->changed_write_time, &write_time) != 0) {
-               lck->modified = True;
-               lck->changed_write_time = write_time;
+       if (timespec_compare(&lck->data->changed_write_time, &write_time) != 0) {
+               lck->data->modified = True;
+               lck->data->changed_write_time = write_time;
        }
 
        TALLOC_FREE(lck);
@@ -1345,96 +1242,57 @@ bool set_write_time(struct file_id fileid, struct timespec write_time)
                            convert_timespec_to_time_t(write_time)),
                 file_id_string_tos(&fileid)));
 
-       lck = get_share_mode_lock(talloc_tos(), fileid);
+       lck = get_existing_share_mode_lock(talloc_tos(), fileid);
        if (lck == NULL) {
                return False;
        }
 
-       if (timespec_compare(&lck->old_write_time, &write_time) != 0) {
-               lck->modified = True;
-               lck->old_write_time = write_time;
+       if (timespec_compare(&lck->data->old_write_time, &write_time) != 0) {
+               lck->data->modified = True;
+               lck->data->old_write_time = write_time;
        }
 
        TALLOC_FREE(lck);
        return True;
 }
 
-
-struct forall_state {
-       void (*fn)(const struct share_mode_entry *entry,
-                  const char *sharepath,
-                  const char *fname,
-                  void *private_data);
-       void *private_data;
-};
-
-static int traverse_fn(struct db_record *rec, void *_state)
+struct timespec get_share_mode_write_time(struct share_mode_lock *lck)
 {
-       struct forall_state *state = (struct forall_state *)_state;
-       uint32_t i;
-       TDB_DATA key;
-       TDB_DATA value;
-       DATA_BLOB blob;
-       enum ndr_err_code ndr_err;
-       struct share_mode_lock *lck;
-
-       key = dbwrap_record_get_key(rec);
-       value = dbwrap_record_get_value(rec);
-
-       /* Ensure this is a locking_key record. */
-       if (key.dsize != sizeof(struct file_id))
-               return 0;
-
-       lck = talloc(talloc_tos(), struct share_mode_lock);
-       if (lck == NULL) {
-               return 0;
-       }
-
-       blob.data = value.dptr;
-       blob.length = value.dsize;
+       struct share_mode_data *d = lck->data;
 
-       ndr_err = ndr_pull_struct_blob(
-               &blob, lck, lck,
-               (ndr_pull_flags_fn_t)ndr_pull_share_mode_lock);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               DEBUG(1, ("ndr_pull_share_mode_lock failed\n"));
-               return 0;
-       }
-       for (i=0; i<lck->num_share_modes; i++) {
-               state->fn(&lck->share_modes[i],
-                         lck->servicepath, lck->base_name,
-                         state->private_data);
+       if (!null_timespec(d->changed_write_time)) {
+               return d->changed_write_time;
        }
-       TALLOC_FREE(lck);
-
-       return 0;
+       return d->old_write_time;
 }
 
-/*******************************************************************
- Call the specified function on each entry under management by the
- share mode system.
-********************************************************************/
-
-int share_mode_forall(void (*fn)(const struct share_mode_entry *, const char *,
-                                const char *, void *),
-                     void *private_data)
+bool file_has_open_streams(files_struct *fsp)
 {
-       struct forall_state state;
-       NTSTATUS status;
-       int count;
+       struct share_mode_lock *lock = NULL;
+       struct share_mode_data *d = NULL;
+       uint32_t i;
 
-       if (lock_db == NULL)
-               return 0;
+       lock = get_existing_share_mode_lock(talloc_tos(), fsp->file_id);
+       if (lock == NULL) {
+               return false;
+       }
+       d = lock->data;
 
-       state.fn = fn;
-       state.private_data = private_data;
+       for (i = 0; i < d->num_share_modes; i++) {
+               struct share_mode_entry *e = &d->share_modes[i];
 
-       status = dbwrap_traverse_read(lock_db, traverse_fn, (void *)&state,
-                                     &count);
+               if (share_mode_stale_pid(d, i)) {
+                       continue;
+               }
 
-       if (!NT_STATUS_IS_OK(status)) {
-               return -1;
-       } else {
-               return count;
+               if (e->private_options &
+                   NTCREATEX_OPTIONS_PRIVATE_STREAM_BASEOPEN)
+               {
+                       TALLOC_FREE(lock);
+                       return true;
+               }
        }
+
+       TALLOC_FREE(lock);
+       return false;
 }