sync with SAMBA_2_2

4 files changed, 27 insertions, 19 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 846e17e6177..2685218152e 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -164,6 +164,8 @@ Changes since 2.2.5
 83) Fix infinite looping bug in winbindd_getgrent()
 84) Fix crash bug on 64-bit systems (merge from HEAD)
 85) Fix extended character bug when setting LanMan/NT password
+86) Negotiate same SMB read size as a Windows 2000 file server
+    to fix performance bug with NT4 clients
 
 
               =========================================
diff --git a/docs/docbook/manpages/smb.conf.5.sgml b/docs/docbook/manpages/smb.conf.5.sgml
index 22a5dfa3998..7dbe762eb6f 100644
--- a/docs/docbook/manpages/smb.conf.5.sgml
+++ b/docs/docbook/manpages/smb.conf.5.sgml
@@ -3505,11 +3505,11 @@
 		with Windows 2000. Note that due to Windows 2000 client redirector bugs
 		this requires Samba to be running on a 64-bit capable operating system such
 		as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with
-		Windows 2000 clients. Defaults to off. Not as tested as some other Samba
-		code paths.
+		Windows 2000 clients. Defaults to on. Windows NT 4.0 only supports
+		read version of this call, and ignores the write version.
 		</para>
 		
-		<para>Default : <command>large readwrite = no</command></para>
+		<para>Default : <command>large readwrite = yes</command></para>
 		</listitem>
 		</varlistentry>
 
@@ -4805,12 +4805,14 @@
 		<varlistentry>
 		<term><anchor id="MAXXMIT">max xmit (G)</term>
 		<listitem><para>This option controls the maximum packet size 
-		that will be negotiated by Samba. The default is 65535, which 
-		is the maximum. In some cases you may find you get better performance 
+		that will be negotiated by Samba. The default in Samba 2.2.6 is
+		now 16644 (changed from 65535 in earlier releases) which matches
+		Windows 2000. This allows better performance with Windows NT clients.
+		The maximum is 65535. In some cases you may find you get better performance 
 		with a smaller value. A value below 2048 is likely to cause problems.
 		</para>
 
-		<para>Default: <command>max xmit = 65535</command></para>
+		<para>Default: <command>max xmit = 16644</command></para>
 		<para>Example: <command>max xmit = 8192</command></para>
 		</listitem>
 		</varlistentry>
diff --git a/docs/htmldocs/smb.conf.5.html b/docs/htmldocs/smb.conf.5.html
index b6798c5552b..9d79c195f9d 100644
--- a/docs/htmldocs/smb.conf.5.html
+++ b/docs/htmldocs/smb.conf.5.html
@@ -9908,13 +9908,13 @@ TARGET="_top"
 		with Windows 2000. Note that due to Windows 2000 client redirector bugs
 		this requires Samba to be running on a 64-bit capable operating system such
 		as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with
-		Windows 2000 clients. Defaults to off. Not as tested as some other Samba
-		code paths.
+		Windows 2000 clients. Defaults to on. Windows NT 4.0 only supports
+		read version of this call, and ignores the write version.
 		</P
 ><P
 >Default : <B
 CLASS="COMMAND"
->large readwrite = no</B
+>large readwrite = yes</B
 ></P
 ></DD
 ><DT
@@ -12374,14 +12374,16 @@ NAME="MAXXMIT"
 ><DD
 ><P
 >This option controls the maximum packet size 
-		that will be negotiated by Samba. The default is 65535, which 
-		is the maximum. In some cases you may find you get better performance 
+		that will be negotiated by Samba. The default in Samba 2.2.6 is
+		now 16644 (changed from 65535 in earlier releases) which matches
+		Windows 2000. This allows better performance with Windows NT clients.
+		The maximum is 65535. In some cases you may find you get better performance 
 		with a smaller value. A value below 2048 is likely to cause problems.
 		</P
 ><P
 >Default: <B
 CLASS="COMMAND"
->max xmit = 65535</B
+>max xmit = 16644</B
 ></P
 ><P
 >Example: <B
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 90c371fee76..0dd47205bc5 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -3,7 +3,7 @@
 .\" <http://shell.ipoline.com/~elmert/hacks/docbook2X/> 
 .\" Please send any bug reports, improvements, comments, patches, 
 .\" etc. to Steve Cheng <steve@ggi-project.org>.
-.TH "SMB.CONF" "5" "09 October 2002" "" ""
+.TH "SMB.CONF" "5" "15 October 2002" "" ""
 .SH NAME
 smb.conf \- The configuration file for the Samba suite
 .SH "SYNOPSIS"
@@ -3503,10 +3503,10 @@ supports the new 64k streaming read and write varient SMB requests introduced
 with Windows 2000. Note that due to Windows 2000 client redirector bugs
 this requires Samba to be running on a 64-bit capable operating system such
 as IRIX, Solaris or a Linux 2.4 kernel. Can improve performance by 10% with
-Windows 2000 clients. Defaults to off. Not as tested as some other Samba
-code paths.
+Windows 2000 clients. Defaults to on. Windows NT 4.0 only supports
+read version of this call, and ignores the write version.
 
-Default : \fBlarge readwrite = no\fR
+Default : \fBlarge readwrite = yes\fR
 .TP
 \fBldap admin dn (G)\fR
 This parameter is only available if Samba has been
@@ -4528,11 +4528,13 @@ Default: \fBmax wins ttl = 518400\fR
 .TP
 \fBmax xmit (G)\fR
 This option controls the maximum packet size 
-that will be negotiated by Samba. The default is 65535, which 
-is the maximum. In some cases you may find you get better performance 
+that will be negotiated by Samba. The default in Samba 2.2.6 is
+now 16644 (changed from 65535 in earlier releases) which matches
+Windows 2000. This allows better performance with Windows NT clients.
+The maximum is 65535. In some cases you may find you get better performance 
 with a smaller value. A value below 2048 is likely to cause problems.
 
-Default: \fBmax xmit = 65535\fR
+Default: \fBmax xmit = 16644\fR
 
 Example: \fBmax xmit = 8192\fR
 .TP