diff options
| author | Jeremy Allison <jra@samba.org> | 1997-12-20 10:52:00 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1997-12-20 10:52:00 +0000 |
| commit | d57c055478a34b9c4a0fc7ba90d20f510d0df797 (patch) | |
| tree | bef7a501594b6a12942ea0b29d9d64ac1b97a9fa /source3/lib/util.c | |
| parent | 7b3369283c89f8114ae60c3d9d50737b35ba0c08 (diff) | |
| download | samba-d57c055478a34b9c4a0fc7ba90d20f510d0df797.tar.gz samba-d57c055478a34b9c4a0fc7ba90d20f510d0df797.tar.bz2 samba-d57c055478a34b9c4a0fc7ba90d20f510d0df797.zip | |
loadparm.c: Added fix for veto oplock files bug from Charles Hoch <hoch@hplcgh.hpl.hp.com>
server.c, util.c: Added fix for oplock break requests blocking due to server being
blocked in read call. Bug found by Charles Hoch <hoch@hplcgh.hpl.hp.com>.
Jeremy.
(This used to be commit 209f894fdbcfbf7a7952b6228342b86e088a9582)
Diffstat (limited to 'source3/lib/util.c')
| -rw-r--r-- | source3/lib/util.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 58560bd227..41ea593ae5 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2268,10 +2268,7 @@ int read_smb_length(int fd,char *inbuf,int timeout) msg_type = CVAL(buffer,0); if (msg_type == 0x85) - { - DEBUG(5,("Got keepalive packet\n")); - ok = False; - } + DEBUG(5,("Got keepalive packet\n")); } DEBUG(10,("got smb length of %d\n",len)); @@ -2295,7 +2292,7 @@ BOOL receive_smb(int fd,char *buffer, int timeout) bzero(buffer,smb_size + 100); len = read_smb_length(fd,buffer,timeout); - if (len == -1) + if (len < 0) return(False); if (len > BUFFER_SIZE) { @@ -2304,12 +2301,13 @@ BOOL receive_smb(int fd,char *buffer, int timeout) exit(1); } - ret = read_data(fd,buffer+4,len); - if (ret != len) { - smb_read_error = READ_ERROR; - return False; + if(len > 0) { + ret = read_data(fd,buffer+4,len); + if (ret != len) { + smb_read_error = READ_ERROR; + return False; + } } - return(True); } |