[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Thu Jul 10 21:00:04 MDT 2014
The branch, master has been updated
via a6523d7 s3:smb2_negprot: change "smb max {read,write,trans}" to 8MiB (as default)
via 1000e42 s3:smb2_negprot: allow "smb max {read,write,trans}" up to 8MiB
from 740d12d libwbclient: reject unknown named blobs in wbcCredentialCache()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a6523d78c347acf56b921edbc2276131b12a51aa
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 13 01:55:21 2014 +0200
s3:smb2_negprot: change "smb max {read,write,trans}" to 8MiB (as default)
This matches Windows 2012R2.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Fri Jul 11 04:59:29 CEST 2014 on sn-devel-104
commit 1000e424fcc530c6befe442b36f7e0e6912c0c30
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 13 01:55:21 2014 +0200
s3:smb2_negprot: allow "smb max {read,write,trans}" up to 8MiB
This matches Windows 2012R2.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
-----------------------------------------------------------------------
Summary of changes:
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 +++---
source3/smbd/smb2_negprot.c | 8 ++++----
5 files changed, 19 insertions(+), 19 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index 045e7d9..3b18531 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -8,13 +8,13 @@
<manvolnum>8</manvolnum></citerefentry> will return to a client, informing the client of the largest
size that may be returned by a single SMB2 read call.
</para>
-<para>The maximum is 1048576 bytes (1MiB), which is the same as a Windows Server 2008 r2.</para>
-<para>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).
+<para>The maximum is 8388608 bytes (8MiB), which is the same as a Windows Server 2012 r2.</para>
+<para>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).</para>
</description>
<related>smb2 max write</related>
<related>smb2 max trans</related>
-<value type="default">1048576</value>
+<value type="default">8388608</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index d4d83b9..64225a5 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -8,13 +8,13 @@
<manvolnum>8</manvolnum></citerefentry> 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.
</para>
-<para>The maximum is 1048576 bytes (1MiB), which is the same as a Windows Server 2008 r2.</para>
-<para>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).
+<para>The maximum is 8388608 bytes (8MiB), which is the same as a Windows Server 2012 r2.</para>
+<para>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).</para>
</description>
<related>smb2 max read</related>
<related>smb2 max write</related>
-<value type="default">1048576</value>
+<value type="default">8388608</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index 1789bc6..4e7103c 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -8,13 +8,13 @@
<manvolnum>8</manvolnum></citerefentry> 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.
</para>
-<para>The maximum is 1048576 bytes (1MiB), which is the same as a Windows Server 2008 r2.</para>
-<para>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).
+<para>The maximum is 8388608 bytes (8MiB), which is the same as a Windows Server 2012 r2.</para>
+<para>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).</para>
</description>
<related>smb2 max read</related>
<related>smb2 max trans</related>
-<value type="default">1048576</value>
+<value type="default">8388608</value>
</samba:parameter>
diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index 584cd09..79f12cb 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 \
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 5fa1fbb..deeb19d 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -300,14 +300,14 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
capabilities |= SMB2_CAP_LARGE_MTU;
req->sconn->smb2.supports_multicredit = true;
- /* SMB >= 2.1 has 1 MB of allowed size */
- max_limit = 0x100000; /* 1MB */
+ /* Windows 2012R2 allows up to 8 MB */
+ max_limit = 0x800000; /* 8MB */
}
}
/*
- * the defaults are 1MB, but we'll limit this to max_limit based on
- * the dialect (64kb for SMB2.0, 1MB for SMB2.1 with LargeMTU)
+ * the defaults are 8MB, but we'll limit this to max_limit based on
+ * the dialect (64kb for SMB 2.0, 8MB for SMB >= 2.1 with LargeMTU)
*
* user configured values exceeding the limits will be overwritten,
* only smaller values will be accepted
--
Samba Shared Repository
More information about the samba-cvs
mailing list