From a6523d78c347acf56b921edbc2276131b12a51aa Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 13 Jun 2014 01:55:21 +0200 Subject: [PATCH] s3:smb2_negprot: change "smb max {read,write,trans}" to 8MiB (as default) This matches Windows 2012R2. Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Autobuild-User(master): Stefan Metzmacher Autobuild-Date(master): Fri Jul 11 04:59:29 CEST 2014 on sn-devel-104 --- docs-xml/smbdotconf/protocol/smb2maxread.xml | 8 ++++---- docs-xml/smbdotconf/protocol/smb2maxtrans.xml | 8 ++++---- docs-xml/smbdotconf/protocol/smb2maxwrite.xml | 8 ++++---- lib/param/loadparm.h | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml index 045e7d95b42..3b18531d239 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxread.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml @@ -8,13 +8,13 @@ 8 will return to a client, informing the client of the largest size that may be returned by a single SMB2 read call. -The maximum is 1048576 bytes (1MiB), which is the same as a Windows Server 2008 r2. -Please note that the default is 1MiB, but it's limit is based on the -smb2 dialect (64KiB for SMB2.0, 1MiB for SMB2.1 with LargeMTU). +The maximum is 8388608 bytes (8MiB), which is the same as a Windows Server 2012 r2. +Please note that the default is 8MiB, but it's limit is based on the +smb2 dialect (64KiB for SMB == 2.0, 8MiB for SMB >= 2.1 with LargeMTU). Large MTU is not supported over NBT (tcp port 139). smb2 max write smb2 max trans -1048576 +8388608 diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml index d4d83b913a8..64225a52c18 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml @@ -8,13 +8,13 @@ 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 maximum is 1048576 bytes (1MiB), which is the same as a Windows Server 2008 r2. -Please note that the default is 1MiB, but it's limit is based on the -smb2 dialect (64KiB for SMB2.0, 1MiB for SMB2.1 with LargeMTU). +The maximum is 8388608 bytes (8MiB), which is the same as a Windows Server 2012 r2. +Please note that the default is 8MiB, but it's limit is based on the +smb2 dialect (64KiB for SMB == 2.0, 1MiB for SMB >= 2.1 with LargeMTU). Large MTU is not supported over NBT (tcp port 139). smb2 max read smb2 max write -1048576 +8388608 diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml index 1789bc6ece0..4e7103c58a2 100644 --- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml +++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml @@ -8,13 +8,13 @@ 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 maximum is 1048576 bytes (1MiB), which is the same as a Windows Server 2008 r2. -Please note that the default is 1MiB, but it's limit is based on the -smb2 dialect (64KiB for SMB2.0, 1MiB for SMB2.1 with LargeMTU). +The maximum is 8388608 bytes (8MiB), which is the same as a Windows Server 2012 r2. +Please note that the default is 8MiB, but it's limit is based on the +smb2 dialect (64KiB for SMB == 2.0, 8MiB for SMB => 2.1 with LargeMTU). Large MTU is not supported over NBT (tcp port 139). smb2 max read smb2 max trans -1048576 +8388608 diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 584cd090c52..79f12cb8edd 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -234,9 +234,9 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; #endif /* SMB2 defaults */ -#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 (8*1024*1024) +#define DEFAULT_SMB2_MAX_WRITE (8*1024*1024) +#define DEFAULT_SMB2_MAX_TRANSACT (8*1024*1024) #define DEFAULT_SMB2_MAX_CREDITS 8192 #define LOADPARM_EXTRA_LOCALS \ -- 2.11.4.GIT