diff options
| author | Jeremy Allison <jra@samba.org> | 2011-02-24 11:59:35 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-02-24 21:44:50 +0100 |
| commit | 2d0727bc4953254562637ef9630476342d76d3d0 (patch) | |
| tree | 37ae57f828b740a8a337b4e050c3b475c2febea2 /source3/smbd | |
| parent | e2532816400f005574c7452e5c4e30a3a8067771 (diff) | |
| download | samba-2d0727bc4953254562637ef9630476342d76d3d0.tar.gz samba-2d0727bc4953254562637ef9630476342d76d3d0.tar.bz2 samba-2d0727bc4953254562637ef9630476342d76d3d0.zip | |
Batch oplocks conflict with exclusive as well as themselves.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Feb 24 21:44:50 CET 2011 on sn-devel-104
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/open.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index cd3fb06f25..d66f9bae17 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]; |