Another part of the fix for Bug 8473 - smb2_find uses a hard coded max reply size...

Change the defaults and the documentation to reflect the 64k limit.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Oct 13 12:22:23 CEST 2011 on sn-devel-104

diff --git a/docs-xml/smbdotconf/protocol/smb2maxcredits.xml b/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
index 310b8989eaf755242772d044c12977da50c7b9bd..3cc219d1ec2cd84e6de325b08518d3669470ca41 100644 (file)
--- 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 f4bcb4bbf0b94cce5bb8313119390b330c70a9a9..266682164855b87fa669fce16c1f9248160f4bf1 100644 (file)
--- 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 dd654f46d169ab81c73ba3e3c2011516915cd281..1c01ccce05ff8ebcd08eeb6f7cbe8bf4c78fbf2c 100644 (file)
--- 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 cdbc47af47dea02d5f1c08d988eb060797955c7a..a302a94a1713e2a8a9408c8b28f97b76fa574ab4 100644 (file)
--- 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 d71a72c2e58aa2340571e4b6aff989162037beaa..203f257dca23a094b8349eec1cab57b839fd54ff 100644 (file)
--- 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