diff options
| author | Jeremy Allison <jra@samba.org> | 2013-01-22 12:38:28 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-01-24 19:21:35 +0100 |
| commit | 033197958ec97140d5632ab875f24350257963dd (patch) | |
| tree | 9f55ccd93ade6f9ddd2990b06258aab514479b42 | |
| parent | 000e6ba14ab1c63278c2a9b10fe271c08f578ccf (diff) | |
| download | samba-033197958ec97140d5632ab875f24350257963dd.tar.gz samba-033197958ec97140d5632ab875f24350257963dd.tar.bz2 samba-033197958ec97140d5632ab875f24350257963dd.zip | |
Revert "s3:smbd: SMB ReadX with size > 0xffff should only possible for samba clients."
Part of fix for bug #9572 - File corruption during SMB1 read by Mac OSX 10.8.2 clients
This reverts commit f8c26c16b82989e002b839fc9eba6386fc036f6a.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/reply.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index b511025d80..210b7010d9 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -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) { |