[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  5b7163a... Only MULTIPLE-UNLOCK test left to fix !
      from  31b1262... When tearing down the connection make sure we close all files before freeing the global context, as we close access to the locking db before freeing the global context.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5b7163a23d92e0a0b00939218edfd685814d7881
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 7 07:25:13 2010 -0700

    Only MULTIPLE-UNLOCK test left to fix !
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/smb2_lock.c  |    2 +-
 source3/smbd/smb2_read.c  |    2 +-
 source3/smbd/smb2_write.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index 8ea36be..ceeba86 100644
--- 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 2f36804..7a92cdf 100644
--- 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 b8e7a9c..7813836 100644
--- 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,


-- 
Samba Shared Repository