From 2d0727bc4953254562637ef9630476342d76d3d0 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 24 Feb 2011 11:59:35 -0800 Subject: Batch oplocks conflict with exclusive as well as themselves. Autobuild-User: Jeremy Allison Autobuild-Date: Thu Feb 24 21:44:50 CET 2011 on sn-devel-104 --- source3/smbd/open.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source3/smbd/open.c b/source3/smbd/open.c index cd3fb06f25a..d66f9bae170 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -946,7 +946,7 @@ static void find_oplock_types(struct share_mode_lock *lck, if (BATCH_OPLOCK_TYPE(lck->share_modes[i].op_type)) { /* batch - can only be one. */ - if (*pp_batch || *got_level2 || *got_no_oplock) { + if (*pp_ex_or_batch || *pp_batch || *got_level2 || *got_no_oplock) { smb_panic("Bad batch oplock entry."); } *pp_batch = &lck->share_modes[i]; -- cgit v1.2.1