[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  95a28ca SMB2 renames return SHARING_VIOLATION if there is any existing oplock on a file. (cherry picked from commit f555a0ea2b14ecb7d1037852b594e7e25ef2c4b5)
      from  5dd200b s3: Add "print notify backchannel" parameter to prevent us doing the reverse print notify connection. (cherry picked from commit e8a8c65f2309cfa4b5a366ae4102d727cc86b5cf)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 95a28ca5f89dc87be004311e57e7f896dbca8ac6
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.
    (cherry picked from commit f555a0ea2b14ecb7d1037852b594e7e25ef2c4b5)

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

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