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

[kai/samba.git] / source3 / smbd / oplock.c

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index d00bcba32a2caa04a744474be9a25d435d5e072c..1ff1737a3f70bca4a2a80a65a25d348ce606a39e 100644 (file)
--- 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);
 }