diff options
| author | Jeremy Allison <jra@samba.org> | 2010-05-11 14:00:38 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-05-11 14:00:38 -0700 |
| commit | 4955ccfff52c18a37cf0ec6e547bb8da0f7269a2 (patch) | |
| tree | 9754dd1c9bc3b54718887462326eea0d3368a4b8 | |
| parent | 454b0b3f20ee8bdf56a12930261391e06567169c (diff) | |
| download | samba-4955ccfff52c18a37cf0ec6e547bb8da0f7269a2.tar.gz samba-4955ccfff52c18a37cf0ec6e547bb8da0f7269a2.tar.bz2 samba-4955ccfff52c18a37cf0ec6e547bb8da0f7269a2.zip | |
Fix more SMB2-OPLOCK bugs. Only 3 more issues to address then we're good to go on this test.
Jeremy.
| -rw-r--r-- | source3/smbd/smb2_create.c | 7 | ||||
| -rw-r--r-- | 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 eb8b2c527b..25e995c3bd 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 25ca3fd3ae..5d51a7fb90 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; |