diff options
| author | Jeremy Allison <jra@samba.org> | 2003-10-09 19:01:31 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2003-10-09 19:01:31 +0000 |
| commit | e74b6f41cffcb134e77edb75346af3148262401b (patch) | |
| tree | 2afe100f5e0870ece9987060112ddd1069187466 /source3/smbd/reply.c | |
| parent | 22c024157129e287a6e4bb4bc7232144c36d9604 (diff) | |
| download | samba-e74b6f41cffcb134e77edb75346af3148262401b.tar.gz samba-e74b6f41cffcb134e77edb75346af3148262401b.tar.bz2 samba-e74b6f41cffcb134e77edb75346af3148262401b.zip | |
At least give a message if we're returning a short read for W2K compatibility.
Jeremy.
(This used to be commit 84c993d9cd0bc57a8b8b9aa716af1336620e2c87)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 5c1d7915c2..5c9451cf37 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -1775,7 +1775,12 @@ int reply_lockread(connection_struct *conn, char *inbuf,char *outbuf, int length * However the requested READ size IS affected by max_recv. Insanity.... JRA. */ - numtoread = MIN(numtoread,max_recv); + if (numtoread > max_recv) { + DEBUG(0,("reply_lockread: requested read size (%u) is greater than maximum allowed (%u). \ +Returning short read of maximum allowed for compatibility with Windows 2000.\n", + (unsigned int)numtoread, (unsigned int)max_recv )); + numtoread = MIN(numtoread,max_recv); + } nread = read_file(fsp,data,startpos,numtoread); if (nread < 0) { @@ -1820,7 +1825,12 @@ int reply_read(connection_struct *conn, char *inbuf,char *outbuf, int size, int /* * The requested read size cannot be greater than max_recv. JRA. */ - numtoread = MIN(numtoread,max_recv); + if (numtoread > max_recv) { + DEBUG(0,("reply_read: requested read size (%u) is greater than maximum allowed (%u). \ +Returning short read of maximum allowed for compatibility with Windows 2000.\n", + (unsigned int)numtoread, (unsigned int)max_recv )); + numtoread = MIN(numtoread,max_recv); + } data = smb_buf(outbuf) + 3; |