[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  6a7d42f Batch oplocks conflict with exclusive as well as themselves. (cherry picked from commit b3c74eceb0c871e9f782b88ad1678573ca38b3b8)
      from  54b81eb s3:rpc_client: we need to pass a non-blocking socket to tstream_bsd_existing_socket()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 6a7d42f5fc93fcb0f059d4b642bbb691d75dada2
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.
    (cherry picked from commit b3c74eceb0c871e9f782b88ad1678573ca38b3b8)

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

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 0c8886d..2ebcb50 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