From 4955ccfff52c18a37cf0ec6e547bb8da0f7269a2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 11 May 2010 14:00:38 -0700 Subject: [PATCH] Fix more SMB2-OPLOCK bugs. Only 3 more issues to address then we're good to go on this test. Jeremy. --- source3/smbd/smb2_create.c | 7 ++++++- source3/smbd/trans2.c | 10 +++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index eb8b2c527b1..25e995c3bd1 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -52,7 +52,12 @@ static uint8_t map_samba_oplock_levels_to_smb2(int oplock_type) return SMB2_OPLOCK_LEVEL_BATCH; } else if (EXCLUSIVE_OPLOCK_TYPE(oplock_type)) { return SMB2_OPLOCK_LEVEL_EXCLUSIVE; - } else if (LEVEL_II_OPLOCK_TYPE(oplock_type)) { + } else if (oplock_type == LEVEL_II_OPLOCK) { + /* + * Don't use LEVEL_II_OPLOCK_TYPE here as + * this also includes FAKE_LEVEL_II_OPLOCKs + * which are internal only. + */ return SMB2_OPLOCK_LEVEL_II; } else { return SMB2_OPLOCK_LEVEL_NONE; diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 25ca3fd3aee..5d51a7fb902 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -5951,7 +5951,15 @@ static NTSTATUS smb2_file_rename_information(connection_struct *conn, return status; } - if (fsp && fsp->base_fsp) { + /* 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] != ':') { return NT_STATUS_NOT_SUPPORTED; -- 2.11.4.GIT