diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-04 15:09:09 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-02-07 16:19:15 -0800 |
| commit | 57d407430fedcaed643f4f2feed72512fca664c2 (patch) | |
| tree | 726522dc35f9052a8d4bf9a72a70a5bf2c0499e0 /source3 | |
| parent | 5be5acb736e35a177452bfd9a7dd008c834f52dc (diff) | |
| download | samba-57d407430fedcaed643f4f2feed72512fca664c2.tar.gz samba-57d407430fedcaed643f4f2feed72512fca664c2.tar.xz samba-57d407430fedcaed643f4f2feed72512fca664c2.zip | |
param: rename lp function and variable from "maxmux" to "max_mux"
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source3/smbd/negprot.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8f6d7756cf..c4068546fd 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -809,7 +809,7 @@ static void init_globals(bool reinit_globals) /* 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.maxmux = 50; /* This is *needed* for profile support. */ + Globals.max_mux = 50; /* This is *needed* for profile support. */ Globals.lpq_cache_time = 30; /* changed to handle large print servers better -- jerry */ Globals._disable_spoolss = false; Globals.max_smbd_processes = 0;/* no limit specified */ diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 315bd89037..d00b354369 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -89,7 +89,7 @@ static void reply_lanman1(struct smb_request *req, uint16 choice) /* Reply, SMBlockread, SMBwritelock supported. */ SCVAL(req->outbuf,smb_flg, FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); SSVAL(req->outbuf,smb_vwv2, sconn->smb1.negprot.max_recv); - SSVAL(req->outbuf,smb_vwv3, lp_maxmux()); /* maxmux */ + SSVAL(req->outbuf,smb_vwv3, lp_max_mux()); /* maxmux */ SSVAL(req->outbuf,smb_vwv4, 1); SSVAL(req->outbuf,smb_vwv5, raw); /* tell redirector we support readbraw writebraw (possibly) */ @@ -136,7 +136,7 @@ static void reply_lanman2(struct smb_request *req, uint16 choice) /* Reply, SMBlockread, SMBwritelock supported. */ SCVAL(req->outbuf,smb_flg,FLAG_REPLY|FLAG_SUPPORT_LOCKREAD); SSVAL(req->outbuf,smb_vwv2,sconn->smb1.negprot.max_recv); - SSVAL(req->outbuf,smb_vwv3,lp_maxmux()); + SSVAL(req->outbuf,smb_vwv3,lp_max_mux()); SSVAL(req->outbuf,smb_vwv4,1); SSVAL(req->outbuf,smb_vwv5,raw); /* readbraw and/or writebraw */ SSVAL(req->outbuf,smb_vwv10, set_server_zone_offset(t)/60); @@ -320,7 +320,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice) smbXsrv_connection_init_tables(req->sconn->conn, PROTOCOL_NT1); - SSVAL(req->outbuf,smb_vwv1+1, lp_maxmux()); /* maxmpx */ + SSVAL(req->outbuf,smb_vwv1+1, lp_max_mux()); /* maxmpx */ SSVAL(req->outbuf,smb_vwv2+1, 1); /* num vcs */ SIVAL(req->outbuf,smb_vwv3+1, sconn->smb1.negprot.max_recv); /* max buffer. LOTS! */ |