[SCM] Samba Shared Repository - branch v4-0-test updated
Karolin Seeger
kseeger at samba.org
Thu May 16 08:30:05 MDT 2013
The branch, v4-0-test has been updated
via 4b2c301 doc-xml/smbdotconf: fix server [min|max] protocol documentation (bug 9883)
via 3c33b54 docs: smb.conf: fix max read/write/trans default values (bug #9871)
from 84e860a WHATSNEW: Add release notes for Samba 4.0.6.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 4b2c301b056dafbee32a8d3116ba5c05130442b2
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Apr 30 08:39:00 2013 +0200
doc-xml/smbdotconf: fix server [min|max] protocol documentation (bug 9883)
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
(cherry picked from commit 0ffd074690529a1833e29829b552b3cf6ebcd914)
Autobuild-User(v4-0-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-0-test): Thu May 16 16:29:11 CEST 2013 on sn-devel-104
commit 3c33b54e0b603e1646f48a437ef9cf23c3a526e7
Author: Björn Baumbach <bb at sernet.de>
Date: Wed May 8 10:27:26 2013 +0200
docs: smb.conf: fix max read/write/trans default values (bug #9871)
Commit 6d128aac119d948f0ecb0dcf6b400b4eb4027fe6 has increased the limit:
"s3:smb2_server increase defaults for read/write/trans sizes to 1MB"
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Fri May 10 23:14:50 CEST 2013 on sn-devel-104
(cherry picked from commit 3b3b5b02555572e48a751ea19ef9dd771a3862da)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 10 ----------
docs-xml/smbdotconf/protocol/serverminprotocol.xml | 2 +-
docs-xml/smbdotconf/protocol/smb2maxread.xml | 7 +++++--
docs-xml/smbdotconf/protocol/smb2maxtrans.xml | 7 +++++--
docs-xml/smbdotconf/protocol/smb2maxwrite.xml | 7 +++++--
5 files changed, 16 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 94184c8..822e42b 100644
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -10,16 +10,6 @@
<para>Possible values are :</para>
<itemizedlist>
<listitem>
- <para><constant>CORE</constant>: Earliest version. No
- concept of user names.</para>
- </listitem>
-
- <listitem>
- <para><constant>COREPLUS</constant>: Slight improvements on
- CORE for efficiency.</para>
- </listitem>
-
- <listitem>
<para><constant>LANMAN1</constant>: First <emphasis>modern</emphasis>
version of the protocol. Long filename support.</para>
</listitem>
diff --git a/docs-xml/smbdotconf/protocol/serverminprotocol.xml b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
index 4edecc4..c324fcb 100644
--- a/docs-xml/smbdotconf/protocol/serverminprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/serverminprotocol.xml
@@ -15,6 +15,6 @@
<related>server max protocol</related>
-<value type="default">CORE</value>
+<value type="default">LANMAN1</value>
<value type="example">NT1</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index 2666821..045e7d9 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -8,10 +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 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</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).
+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">65536</value>
+<value type="default">1048576</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index 1c01ccc..d4d83b9 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -8,10 +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 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</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).
+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">65536</value>
+<value type="default">1048576</value>
</samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index a302a94..1789bc6 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -8,10 +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 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</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).
+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">65536</value>
+<value type="default">1048576</value>
</samba:parameter>
--
Samba Shared Repository
More information about the samba-cvs
mailing list