[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  89b6af0 SMB2 renames return SHARING_VIOLATION if there is any existing oplock on a file.
      from  4b347a1 s3: Add "print notify backchannel" parameter to prevent us doing the reverse print notify connection.

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


- Log -----------------------------------------------------------------
commit 89b6af0982fc935c6b9b0f5aa2beea696b332709
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Mar 18 14:57:05 2011 -0700

    SMB2 renames return SHARING_VIOLATION if there is any existing oplock on a file.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Fri Mar 18 23:39:49 CET 2011 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/smb2_setinfo.c b/source3/smbd/smb2_setinfo.c
index 9afb487..26d94e2 100644
--- a/source3/smbd/smb2_setinfo.c
+++ b/source3/smbd/smb2_setinfo.c
@@ -216,6 +216,12 @@ static struct tevent_req *smbd_smb2_setinfo_send(TALLOC_CTX *mem_ctx,
 		if (file_info_level == SMB_FILE_RENAME_INFORMATION) {
 			/* SMB2_FILE_RENAME_INFORMATION_INTERNAL == 0xFF00 + in_file_info_class */
 			file_info_level = SMB2_FILE_RENAME_INFORMATION_INTERNAL;
+			if (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK &&
+			    fsp->oplock_type != NO_OPLOCK) {
+				/* No break, but error. */
+				tevent_req_nterror(req, NT_STATUS_SHARING_VIOLATION);
+				return tevent_req_post(req, ev);
+			}
 		}
 
 		if (fsp->fh->fd == -1) {


-- 
Samba Shared Repository