[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  3b3b5b0 docs: smb.conf: fix max read/write/trans default values (bug #9871)
      from  392b01f s4:torture fix a build break on AIX

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3b3b5b02555572e48a751ea19ef9dd771a3862da
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

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/smbdotconf/protocol/smb2maxread.xml  |    7 +++++--
 docs-xml/smbdotconf/protocol/smb2maxtrans.xml |    7 +++++--
 docs-xml/smbdotconf/protocol/smb2maxwrite.xml |    7 +++++--
 3 files changed, 15 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

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