[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  1101c62... Pass more SMB2 oplock tests. Only oplock stream tests left to fix.
      from  9cddf89... Choose between local tevent_status.h header file and installed one

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


- Log -----------------------------------------------------------------
commit 1101c6214415675fbd32377d539276ca19c4407f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed May 12 15:19:45 2010 -0700

    Pass more SMB2 oplock tests. Only oplock stream tests left to fix.
    
    Jeremy.

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

Summary of changes:
 source3/smbd/oplock.c     |    5 ++++-
 source3/smbd/smb2_break.c |    6 ++++++
 2 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index d00bcba..1ff1737 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -320,7 +320,10 @@ static void oplock_timeout_handler(struct event_context *ctx,
 	TALLOC_FREE(fsp->oplock_timeout);
 	DEBUG(0, ("Oplock break failed for file %s -- replying anyway\n",
 		  fsp_str_dbg(fsp)));
-	global_client_failed_oplock_break = True;
+	/* Only set this for SMB1.. */
+	if (!smbd_server_conn->allow_smb2) {
+		global_client_failed_oplock_break = True;
+	}
 	remove_oplock(fsp);
 	reply_to_oplock_break_requests(fsp);
 }
diff --git a/source3/smbd/smb2_break.c b/source3/smbd/smb2_break.c
index bd0fc56..a214da0 100644
--- a/source3/smbd/smb2_break.c
+++ b/source3/smbd/smb2_break.c
@@ -204,6 +204,12 @@ static struct tevent_req *smbd_smb2_oplock_break_send(TALLOC_CTX *mem_ctx,
 		fsp_str_dbg(fsp),
 		fsp->fnum ));
 
+	/* Are we awaiting a break message ? */
+	if (fsp->oplock_timeout == NULL) {
+		tevent_req_nterror(req, NT_STATUS_INVALID_OPLOCK_PROTOCOL);
+		return tevent_req_post(req, ev);
+	}
+
 	if ((fsp->sent_oplock_break == BREAK_TO_NONE_SENT) ||
 			(break_to_none)) {
 		result = remove_oplock(fsp);


-- 
Samba Shared Repository