[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Thu Feb 24 13:45:01 MST 2011


The branch, master has been updated
       via  2d0727b Batch oplocks conflict with exclusive as well as themselves.
      from  e253281 s4:dynconfig: fix segfault in the set_dyn_*() functions

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 2d0727bc4953254562637ef9630476342d76d3d0
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 24 11:59:35 2011 -0800

    Batch oplocks conflict with exclusive as well as themselves.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Feb 24 21:44:50 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/smbd/open.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index cd3fb06..d66f9ba 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];


-- 
Samba Shared Repository


More information about the samba-cvs mailing list