[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  e799de2... SMB2: Fix rename on Windows 7.
      from  e9ff32c... Don't use sigev_value.sival_int to just store the mid, use sigev_value.sival_ptr to store the private data structure.

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


- Log -----------------------------------------------------------------
commit e799de256e418f011a042f999904872fecae4011
Author: Ira Cooper <samba at ira.wakeful.net>
Date:   Tue Jun 1 17:09:29 2010 -0700

    SMB2: Fix rename on Windows 7.
    
    This removes some code Jeremy (jra) suspected was bad.  It turns out that the
    command window rename command will not work with the offending code in place.
    
    With it removed the bug is gone, and rename works.

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

Summary of changes:
 source3/smbd/trans2.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 2c0bca9..f69cefe 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6003,14 +6003,6 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn,
 		return status;
 	}
 
-	/* Ok, this looks wrong to me, but appears to
-	 * be how SMB2 renames work. CHECK WITH Microsoft !
-	 * jra.
-	 */
-	if (fsp->oplock_type != NO_OPLOCK) {
-		return NT_STATUS_SHARING_VIOLATION;
-	}
-
 	if (fsp->base_fsp) {
 		/* newname must be a stream name. */
 		if (newname[0] != ':') {


-- 
Samba Shared Repository