sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

At least give a message if we're returning a short read for W2K compatibility.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 0001-01-01 00:00:00 +00:00
parent e7565dbba6
commit 84c993d9cd
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/smbd/reply.c
View File

@ -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;