[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  d2a9e8d Another part of the fix for Bug 8473 - smb2_find uses a hard coded max reply size of 0x10000 instead of smb2_max_trans.
      from  5dcce64 config.h: define HAVE_LIBREPLACE

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


- Log -----------------------------------------------------------------
commit d2a9e8df35be1516f22f0ef78356de6d4b02d4d3
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 12 14:00:32 2011 -0700

    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 <metze at samba.org>
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Thu Oct 13 12:22:23 CEST 2011 on sn-devel-104

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

Summary of changes:
 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(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
index 310b898..3cc219d 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.
 <para>The default is 8192 credits, which is the same as a Windows 2008R2 SMB2 server.</para>
 </description>
 
-<value type="default">128</value>
+<value type="default">8192</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxread.xml b/docs-xml/smbdotconf/protocol/smb2maxread.xml
index f4bcb4b..2666821 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxread.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxread.xml
@@ -8,10 +8,10 @@
 <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 default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server.</para>
+<para>The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</para>
 </description>
 
 <related>smb2 max write</related>
 <related>smb2 max trans</related>
-<value type="default">1048576</value>
+<value type="default">65536</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
index dd654f4..1c01ccc 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxtrans.xml
@@ -8,10 +8,10 @@
 <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 default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server.</para>
+<para>The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</para>
 </description>
 
 <related>smb2 max read</related>
 <related>smb2 max write</related>
-<value type="default">1048576</value>
+<value type="default">65536</value>
 </samba:parameter>
diff --git a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
index cdbc47a..a302a94 100644
--- a/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
+++ b/docs-xml/smbdotconf/protocol/smb2maxwrite.xml
@@ -8,10 +8,10 @@
 <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 default is 1048576 bytes (1MB), which is the same as a Windows7 SMB2 server.</para>
+<para>The maximum is 65536 bytes (64KB), which is the same as a Windows Vista SMB2 server.</para>
 </description>
 
 <related>smb2 max read</related>
 <related>smb2 max trans</related>
-<value type="default">1048576</value>
+<value type="default">65536</value>
 </samba:parameter>
diff --git a/source3/include/local.h b/source3/include/local.h
index d71a72c..203f257 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -232,9 +232,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
 


-- 
Samba Shared Repository