sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

Revert "s3:smbd: SMB ReadX with size > 0xffff should only possible for samba clients."

Browse Source 
Part of fix for bug #9572 -  File corruption during SMB1 read by Mac OSX 10.8.2 clients

This reverts commit f8c26c16b8.

Signed-off-by: Jeremy Allison <jra@samba.org>

Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
This commit is contained in:
Jeremy Allison 2013-01-22 12:38:28 -08:00
parent 000e6ba14a
commit 033197958e
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source3/smbd/reply.c
View File

@ -3854,7 +3854,6 @@ nosendfile_read:
void reply_read_and_X(struct smb_request *req)
{
struct smbd_server_connection *sconn = req->sconn;
connection_struct *conn = req->conn;
files_struct *fsp;
off_t startpos;
@ -3893,15 +3892,7 @@ void reply_read_and_X(struct smb_request *req)
return;
}
if ((sconn->smb1.unix_info.client_cap_low & CIFS_UNIX_LARGE_READ_CAP) ||
(get_remote_arch() == RA_SAMBA)) {
/*
* This is Samba only behavior (up to Samba 3.6)!
*
* Windows 2008 R2 ignores the upper_size,
* so we do unless unix extentions are active
* or "smbclient" is talking to us.
*/
if (global_client_caps & CAP_LARGE_READX) {
size_t upper_size = SVAL(req->vwv+7, 0);
smb_maxcnt |= (upper_size<<16);
if (upper_size > 1) {