diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-03-23 03:17:38 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2004-03-23 03:17:38 +0000 |
| commit | 0340fec0c1a01339d459c9505614d69ac6a62e9b (patch) | |
| tree | c120aae94b2d3a7e60135c0794e8f2455e72e831 /source4 | |
| parent | c5679b707e69a931676ae074917b63b985ed17fb (diff) | |
| download | samba-0340fec0c1a01339d459c9505614d69ac6a62e9b.tar.gz samba-0340fec0c1a01339d459c9505614d69ac6a62e9b.tar.bz2 samba-0340fec0c1a01339d459c9505614d69ac6a62e9b.zip | |
put the "max xmit" option back into Samba4
(This used to be commit 82e50a1ce8904c72c90b1e771f232acaad2c835e)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 64b316bbbd..0dcbe64f7f 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -149,6 +149,7 @@ typedef struct char *szGuestaccount; int mangled_stack; int max_mux; + int max_xmit; int pwordlevel; int unamelevel; int maxprotocol; @@ -619,6 +620,7 @@ static struct parm_struct parm_table[] = { {"announce version", P_STRING, P_GLOBAL, &Globals.szAnnounceVersion, NULL, NULL, FLAG_DEVELOPER}, {"announce as", P_ENUM, P_GLOBAL, &Globals.announce_as, NULL, enum_announce_as, FLAG_DEVELOPER}, {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"max xmit", P_INTEGER, P_GLOBAL, &Globals.max_xmit, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"name resolve order", P_STRING, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER}, {"max ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -972,6 +974,7 @@ static void init_globals(void) Globals.bLoadPrinters = True; Globals.mangled_stack = 50; Globals.max_mux = 50; /* This is *needed* for profile support. */ + Globals.max_xmit = 4356; /* the value w2k3 chooses */ Globals.lpqcachetime = 10; Globals.bDisableSpoolss = False; Globals.pwordlevel = 0; @@ -1280,6 +1283,7 @@ FN_GLOBAL_INTEGER(lp_max_wins_ttl, &Globals.max_wins_ttl) FN_GLOBAL_INTEGER(lp_min_wins_ttl, &Globals.min_wins_ttl) FN_GLOBAL_INTEGER(lp_time_offset, &Globals.time_offset) FN_GLOBAL_INTEGER(lp_maxmux, &Globals.max_mux) +FN_GLOBAL_INTEGER(lp_max_xmit, &Globals.max_xmit) FN_GLOBAL_INTEGER(lp_passwordlevel, &Globals.pwordlevel) FN_GLOBAL_INTEGER(lp_usernamelevel, &Globals.unamelevel) FN_GLOBAL_INTEGER(lp_maxprotocol, &Globals.maxprotocol) diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index b8e1e032e2..8769a6f3f1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -746,7 +746,7 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int /* this is the size that w2k uses, and it appears to be important for good performance */ - smb->negotiate.max_recv = 4356; + smb->negotiate.max_recv = lp_max_xmit(); smb->users.next_vuid = VUID_OFFSET; |