diff options
| author | Jeremy Allison <jra@samba.org> | 1997-11-11 01:19:32 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-11-11 01:19:32 +0000 |
| commit | daa618991028862ba2c2d91fd4a83eeace46cd6a (patch) | |
| tree | 34188ce29257c1b4330a42000467f4db8e744908 | |
| parent | 5c3f9f4e2c7ab8e2190e2089dccfa01d1fd44f5e (diff) | |
| download | samba-daa618991028862ba2c2d91fd4a83eeace46cd6a.tar.gz samba-daa618991028862ba2c2d91fd4a83eeace46cd6a.tar.bz2 samba-daa618991028862ba2c2d91fd4a83eeace46cd6a.zip | |
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.
(This used to be commit 2fe8a730d9eeadca22ed1424014181e193ce3d52)
| -rw-r--r-- | source3/smbd/server.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 278087b60a..e3328690b0 100644 --- a/source3/smbd/server.c +++ b/source3/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. */ |