From a97cbf014efed5c85447d6478d4fc6803828bc8b Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 12 Oct 2011 14:00:32 -0700 Subject: [PATCH] Another part of the fix for Bug 8473 - smb2_find uses a hard coded max reply size of 0x10000 instead of smb2_max_trans. Change the defaults and the documentation to reflect the 64k limit. Signed-off-by: Stefan Metzmacher Autobuild-User: Stefan Metzmacher Autobuild-Date: Thu Oct 13 12:22:23 CEST 2011 on sn-devel-104 (cherry picked from commit d2a9e8df35be1516f22f0ef78356de6d4b02d4d3) --- docs-xml/smbdotconf/protocol/smb2maxcredits.xml | 2 +- docs-xml/smbdotconf/protocol/smb2maxread.xml | 4 ++-- docs-xml/smbdotconf/protocol/smb2maxtrans.xml | 4 ++-- docs-xml/smbdotconf/protocol/smb2maxwrite.xml | 4 ++-- source3/include/local.h | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml index 310b8989eaf..3cc219d1ec2 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml @@ -11,5 +11,5 @@ parameter for SMB1. You should never need to set this parameter. The default is 8192 credits, which is the same as a Windows 2008R2 SMB2 server. -128 +8192 diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml index f4bcb4bbf0b..26668216485 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxread.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml @@ -8,10 +8,10 @@ 8 will return to a client, informing the client of the largest size that may be returned by a single SMB2 read call. -The default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server. +The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server. smb2 max write smb2 max trans -1048576 +65536 diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml index dd654f46d16..1c01ccce05f 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml @@ -8,10 +8,10 @@ 8 will return to a client, informing the client of the largest size of buffer that may be used in querying file meta-data via QUERY_INFO and related SMB2 calls. -The default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server. +The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server. smb2 max read smb2 max write -1048576 +65536 diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml index cdbc47af47d..a302a94a171 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml @@ -8,10 +8,10 @@ 8 will return to a client, informing the client of the largest size that may be sent to the server by a single SMB2 write call. -The default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server. +The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server. smb2 max read smb2 max trans -1048576 +65536 diff --git a/source3/include/local.h b/source3/include/local.h index 807d3c975e6..d6595220730 100644 --- a/source3/include/local.h +++ b/source3/include/local.h @@ -261,9 +261,9 @@ #define CLIENT_NDR_PADDING_SIZE 8 #define SERVER_NDR_PADDING_SIZE 8 -#define DEFAULT_SMB2_MAX_READ (1024*1024) -#define DEFAULT_SMB2_MAX_WRITE (1024*1024) -#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024) +#define DEFAULT_SMB2_MAX_READ (64*1024) +#define DEFAULT_SMB2_MAX_WRITE (64*1024) +#define DEFAULT_SMB2_MAX_TRANSACT (64*1024) #define DEFAULT_SMB2_MAX_CREDITS 8192 #define DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR 2 -- 2.34.1