Only MULTIPLE-UNLOCK test left to fix !

Jeremy.

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 8ea36be8ed7bedaa11f417f9cd38bfac31f2f3d5..ceeba8613842d815e6ad34b7ee189491c9efee0d 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -341,7 +341,7 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
                        return tevent_req_post(req, ev);
                }
 
-               locks[i].smblctx = in_smbpid;
+               locks[i].smblctx = in_file_id_volatile;
                locks[i].offset = in_locks[i].offset;
                locks[i].count  = in_locks[i].length;
 

diff --git a/source3/smbd/smb2_read.c b/source3/smbd/smb2_read.c
index 2f36804bf6a0974787292675c34d211e8900f957..7a92cdf920d041803c2a52f31163cd60ee975f20 100644 (file)
--- a/source3/smbd/smb2_read.c
+++ b/source3/smbd/smb2_read.c
@@ -261,7 +261,7 @@ static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
        }
 
        init_strict_lock_struct(fsp,
-                               in_smbpid,
+                               in_file_id_volatile,
                                in_offset,
                                in_length,
                                READ_LOCK,

diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index b8e7a9c8167eaf7cd64d8e931ec9947de21bc1d9..7813836e6564c4bb03fc5c29235b8b42de57a03a 100644 (file)
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -254,7 +254,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
        }
 
        init_strict_lock_struct(fsp,
-                               in_smbpid,
+                               in_file_id_volatile,
                                in_offset,
                                in_data.length,
                                WRITE_LOCK,