diff options
| author | Gerald Carter <jerry@samba.org> | 2002-10-15 21:42:41 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-10-15 21:42:41 +0000 |
| commit | 7701997aae24e909c20ad882eb7743924c513992 (patch) | |
| tree | 850965219f369a7782b7b5f0ed60937e4bb3b548 | |
| parent | 4f77cf6a2a2ae4b01c02d64ca0a8fd075310bada (diff) | |
| download | samba-7701997aae24e909c20ad882eb7743924c513992.tar.gz samba-7701997aae24e909c20ad882eb7743924c513992.tar.xz samba-7701997aae24e909c20ad882eb7743924c513992.zip | |
sync with SAMBA_2_2 for rc4
| -rw-r--r-- | source/param/loadparm.c | 6 | ||||
| -rw-r--r-- | source/smbd/negprot.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/param/loadparm.c b/source/param/loadparm.c index b7be1053b7a..dd183ab8af9 100644 --- a/source/param/loadparm.c +++ b/source/param/loadparm.c @@ -1315,7 +1315,9 @@ static void init_globals(void) Globals.bLoadPrinters = True; Globals.bUseRhosts = False; 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; @@ -1324,7 +1326,7 @@ static void init_globals(void) Globals.pwordlevel = 0; Globals.unamelevel = 0; Globals.deadtime = 0; - Globals.bLargeReadwrite = False; + Globals.bLargeReadwrite = True; Globals.max_log_size = 5000; Globals.max_open_files = MAX_OPEN_FILES; Globals.maxprotocol = PROTOCOL_NT1; diff --git a/source/smbd/negprot.c b/source/smbd/negprot.c index 21f1cbd1b45..e67026cdccc 100644 --- a/source/smbd/negprot.c +++ b/source/smbd/negprot.c @@ -219,7 +219,7 @@ static int reply_nt1(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 */ |