Left global_oplock_break set while request to break oplock is

outstanding to client. Done to allay Andrews' fears about
readbraw crossing on the wire :-).
Jeremy.

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 278087b60aacf5a53d59bd5e2906b8e85733ab24..e3328690b03c66db6537c0a598465ef73de07bf3 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -2844,6 +2844,7 @@ Allowing break to succeed regardless.\n", timestring(), fsp->name, fnum, dev, in
  
   send_smb(Client, outbuf);
 
+  /* We need this in case a readraw crosses on the wire. */
   global_oplock_break = True;
  
   /* Process incoming messages. */
@@ -2879,10 +2880,6 @@ inode = %x).\n", timestring(), fsp->name, fnum, dev, inode));
     }
     process_smb(inbuf, outbuf);
 
-    /* We only need this in case a readraw crossed on the wire. */
-    if(global_oplock_break)
-      global_oplock_break = False;
-
     /*
      * Die if we go over the time limit.
      */
@@ -2898,6 +2895,10 @@ inode = %x).\n", timestring(), fsp->name, fnum, dev, inode));
     }
   }
 
+  /* We need this in case a readraw crossed on the wire. */
+  if(global_oplock_break)
+    global_oplock_break = False;
+
   /*
    * If the client did not respond we must die.
    */