summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-04-19 00:14:52 +0200
committerStefan Metzmacher <metze@samba.org>2008-04-19 01:54:42 +0200
commitb2f2c1486e9c6bd6fdba3dc321f9df0d29d7def2 (patch)
tree6f4d71c7133cb70505c9308bfe91d8e1bb090ee8
parent08f83c59df7a0e490da55a536b6e04a32508d2b0 (diff)
downloadsamba-b2f2c1486e9c6bd6fdba3dc321f9df0d29d7def2.tar.gz
samba-b2f2c1486e9c6bd6fdba3dc321f9df0d29d7def2.tar.bz2
samba-b2f2c1486e9c6bd6fdba3dc321f9df0d29d7def2.zip
ntvfs_generic: fix mapping the granted oplocks for SMB2
metze (This used to be commit 60c4a4fc1afe88716ac63d3ea430e07fea7b9991)
-rw-r--r--source4/ntvfs/ntvfs_generic.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index 5d4bbf388c..debcfc3f8a 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -209,13 +209,13 @@ static NTSTATUS ntvfs_map_open_finish(struct ntvfs_module_context *ntvfs,
case RAW_OPEN_SMB2:
io->smb2.out.file.ntvfs = io2->generic.out.file.ntvfs;
switch (io2->generic.out.oplock_level) {
- case OPLOCK_BATCH:
+ case BATCH_OPLOCK_RETURN:
io->smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_BATCH;
break;
- case OPLOCK_EXCLUSIVE:
+ case EXCLUSIVE_OPLOCK_RETURN:
io->smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_EXCLUSIVE;
break;
- case OPLOCK_LEVEL_II:
+ case LEVEL_II_OPLOCK_RETURN:
io->smb2.out.oplock_level = SMB2_OPLOCK_LEVEL_II;
break;
default: