s3:smbd: Remove server_will_accept_large_read() and erroneous comment.
authorJeremy Allison <jra@samba.org>
Fri, 15 Mar 2013 18:53:04 +0000 (11:53 -0700)
committerJeremy Allison <jra@samba.org>
Wed, 20 Mar 2013 16:32:26 +0000 (09:32 -0700)
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>
source3/smbd/reply.c

index 2c31f159171bef255c5a3fd074222429d3f3cfc2..edcfb77b3e945c90ebf78ef824dffeb1de33e6d1 100644 (file)
@@ -3847,26 +3847,6 @@ nosendfile_read:
        return;
 }
 
-/****************************************************************************
- 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. */