diff options
| author | Jeremy Allison <jra@samba.org> | 2013-03-15 11:53:04 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-03-20 09:32:26 -0700 |
| commit | 21707defe06e1db18a6645b0b56db4178e3df5f6 (patch) | |
| tree | 1d354c4fa4e1e99fc79effa9efe6ea29bd8bc201 | |
| parent | 36f6a8abb2ad0c7d0551679cc61a29fa2dc16d80 (diff) | |
| download | samba-21707defe06e1db18a6645b0b56db4178e3df5f6.tar.gz samba-21707defe06e1db18a6645b0b56db4178e3df5f6.tar.bz2 samba-21707defe06e1db18a6645b0b56db4178e3df5f6.zip | |
s3:smbd: Remove server_will_accept_large_read() and erroneous comment.
We're going to replace this with a function that calculates
the max PDU to return on a read and supports short reads.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/reply.c | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 2c31f15917..edcfb77b3e 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3848,26 +3848,6 @@ nosendfile_read: } /**************************************************************************** - MacOSX clients send large reads without telling us they are going to do that. - Bug #9572 - File corruption during SMB1 read by Mac OSX 10.8.2 clients - Allow this if we are talking to a Samba client, or if we told the client - we supported this. -****************************************************************************/ - -static bool server_will_accept_large_read(void) -{ - /* Samba client ? No problem. */ - if (get_remote_arch() == RA_SAMBA) { - return true; - } - /* Need UNIX extensions. */ - if (!lp_unix_extensions()) { - return false; - } - return true; -} - -/**************************************************************************** Reply to a read and X. ****************************************************************************/ @@ -3913,14 +3893,7 @@ void reply_read_and_X(struct smb_request *req) } upper_size = SVAL(req->vwv+7, 0); - if ((upper_size != 0) && server_will_accept_large_read()) { - /* - * 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 (upper_size != 0) { smb_maxcnt |= (upper_size<<16); if (upper_size > 1) { /* Can't do this on a chained packet. */ |