summaryrefslogtreecommitdiff
path: root/source3/smbd/oplock.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2006-05-30 18:17:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:14 -0500
commit7361c7a883646dd065eabf81e0b1dc60cc9d1f39 (patch)
treec355c3da953c8b21b79bd5b579550d7d1e1c090b /source3/smbd/oplock.c
parentbef4969247da237e7b50fd2abd207de92e9bc980 (diff)
downloadsamba-7361c7a883646dd065eabf81e0b1dc60cc9d1f39.tar.gz
samba-7361c7a883646dd065eabf81e0b1dc60cc9d1f39.tar.bz2
samba-7361c7a883646dd065eabf81e0b1dc60cc9d1f39.zip
r15958: Make us pass RAW-OPLOCK with kernel oplocks off.
This allows a requestor to set FORCE_OPLOCK_BREAK_TO_NONE to ensure we don't break to level 2. Fixed a couple of resource leaks in error paths in open_file_ntcreatex. Jeremy. (This used to be commit c7c9adcce7f13d01445f31b07fb28a76f0a1d6df)
Diffstat (limited to 'source3/smbd/oplock.c')
-rw-r--r--source3/smbd/oplock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 42c64a2843..1f731e1729 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -540,6 +540,7 @@ static void process_oplock_break_message(int msg_type, struct process_id src,
}
if ((global_client_caps & CAP_LEVEL_II_OPLOCKS) &&
+ !(msg.op_type & FORCE_OPLOCK_BREAK_TO_NONE) &&
!koplocks && /* NOTE: we force levelII off for kernel oplocks -
* this will change when it is supported */
lp_level2_oplocks(SNUM(fsp->conn))) {