Change default of max_xmit to match W2K. Ensure NT negprot uses it.

Jeremy.
(This used to be commit 0bf7187e3ba57ee2422a0f6f736266a55502123c)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 500119575a9f84d2b99a0e21dfaef7bc70121481..5d1ef9b91f5a1bfb573d5e83f828f0f9eeed70ae 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1289,7 +1289,9 @@ static void init_globals(void)
 
        Globals.bLoadPrinters = True;
        Globals.mangled_stack = 50;
-       Globals.max_xmit = 65535;
+       /* Was 65535 (0xFFFF). 0x4101 matches W2K and causes major speed improvements... */
+       /* Discovered by 2 days of pain by Don McCall @ HP :-). */
+       Globals.max_xmit = 0x4104;
        Globals.max_mux = 50;   /* This is *needed* for profile support. */
        Globals.lpqcachetime = 10;
        Globals.bDisableSpoolss = False;

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 16427b00d705ee101a89babde07090764c2df415..06a55cb33ea298de1d1e995b162f96b0ec3f4862 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -275,7 +275,7 @@ static int reply_nt1(char *inbuf, char *outbuf)
        
        SSVAL(outbuf,smb_vwv1+1,lp_maxmux()); /* maxmpx */
        SSVAL(outbuf,smb_vwv2+1,1); /* num vcs */
-       SIVAL(outbuf,smb_vwv3+1,0xffff); /* max buffer. LOTS! */
+       SIVAL(outbuf,smb_vwv3+1,max_recv); /* max buffer. LOTS! */
        SIVAL(outbuf,smb_vwv5+1,0x10000); /* raw size. full 64k */
        SIVAL(outbuf,smb_vwv7+1,sys_getpid()); /* session key */
        SIVAL(outbuf,smb_vwv9+1,capabilities); /* capabilities */