diff options
author | Andrew Tridgell <tridge@samba.org> | 1996-07-30 15:47:30 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 1996-07-30 15:47:30 +0000 |
commit | 2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87 (patch) | |
tree | 179251b54f35c910b512338d2b420bcd7fcd3763 /source3/smbd/reply.c | |
parent | a7ed8cd8ac3e1c0f8cd68bed654ae21cb3acde12 (diff) | |
download | samba-2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87.tar.gz samba-2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87.tar.bz2 samba-2b4b7b4e1adbd2aac9aab89b28df82fc145a6d87.zip |
fix a bug that we've had for a long time where we don't handle EOF
properly from clients, and end up looping like mad.
At least I _hope_ this is fixed.
(This used to be commit a7c7d7afe2ef81f4a74584ce9b71e54442f7e484)
Diffstat (limited to 'source3/smbd/reply.c')
-rw-r--r-- | source3/smbd/reply.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 13cc8efe5d..d463b305c9 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1363,7 +1363,7 @@ int reply_readbraw(char *inbuf, char *outbuf) fname,startpos,nread,ret)); #else - ret = read_file(fnum,header+4,startpos,nread,nread,-1,False); + ret = read_file(fnum,header+4,startpos,nread); if (ret < mincount) ret = 0; _smb_setlen(header,ret); @@ -1405,7 +1405,7 @@ int reply_lockread(char *inbuf,char *outbuf) if(!do_lock( fnum, cnum, numtoread, startpos, &eclass, &ecode)) return (ERROR(eclass,ecode)); - nread = read_file(fnum,data,startpos,numtoread,numtoread,-1,False); + nread = read_file(fnum,data,startpos,numtoread); if (nread < 0) return(UNIXERROR(ERRDOS,ERRnoaccess)); @@ -1450,7 +1450,7 @@ int reply_read(char *inbuf,char *outbuf) return(ERROR(ERRDOS,ERRlock)); if (numtoread > 0) - nread = read_file(fnum,data,startpos,numtoread,numtoread,-1,False); + nread = read_file(fnum,data,startpos,numtoread); if (nread < 0) return(UNIXERROR(ERRDOS,ERRnoaccess)); @@ -1495,7 +1495,7 @@ int reply_read_and_X(char *inbuf,char *outbuf,int length,int bufsize) if (is_locked(fnum,cnum,smb_maxcnt,smb_offs)) return(ERROR(ERRDOS,ERRlock)); - nread = read_file(fnum,data,smb_offs,smb_maxcnt,smb_maxcnt,-1,False); + nread = read_file(fnum,data,smb_offs,smb_maxcnt); ok = True; if (nread < 0) @@ -2934,7 +2934,7 @@ int reply_readbmpx(char *inbuf,char *outbuf,int length,int bufsize) { int N = MIN(max_per_packet,tcount-total_read); - nread = read_file(fnum,data,startpos,N,N,-1,False); + nread = read_file(fnum,data,startpos,N); if (nread <= 0) nread = 0; |