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 /source4 | |
| 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 'source4')
| -rw-r--r-- | source4/param/loadparm.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/negprot.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index faf2f4ddb4..529c828e09 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -35,7 +35,7 @@ void lpcfg_smbcli_options(struct loadparm_context *lp_ctx, struct smbcli_options *options) { options->max_xmit = lpcfg_max_xmit(lp_ctx); - options->max_mux = lpcfg_maxmux(lp_ctx); + options->max_mux = lpcfg_max_mux(lp_ctx); options->use_spnego = lpcfg_nt_status_support(lp_ctx) && lpcfg_use_spnego(lp_ctx); options->signing = lpcfg_client_signing(lp_ctx); options->request_timeout = SMB_REQUEST_TIMEOUT; diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c index 7c1d3a7076..fa2a6d2a4a 100644 --- a/source4/smb_server/smb/negprot.c +++ b/source4/smb_server/smb/negprot.c @@ -139,7 +139,7 @@ static void reply_lanman1(struct smbsrv_request *req, uint16_t choice) SSVAL(req->out.vwv, VWV(0), choice); SSVAL(req->out.vwv, VWV(1), secword); SSVAL(req->out.vwv, VWV(2), req->smb_conn->negotiate.max_recv); - SSVAL(req->out.vwv, VWV(3), lpcfg_maxmux(req->smb_conn->lp_ctx)); + SSVAL(req->out.vwv, VWV(3), lpcfg_max_mux(req->smb_conn->lp_ctx)); SSVAL(req->out.vwv, VWV(4), 1); SSVAL(req->out.vwv, VWV(5), raw); SIVAL(req->out.vwv, VWV(6), req->smb_conn->connection->server_id.pid); @@ -190,7 +190,7 @@ static void reply_lanman2(struct smbsrv_request *req, uint16_t choice) SSVAL(req->out.vwv, VWV(0), choice); SSVAL(req->out.vwv, VWV(1), secword); SSVAL(req->out.vwv, VWV(2), req->smb_conn->negotiate.max_recv); - SSVAL(req->out.vwv, VWV(3), lpcfg_maxmux(req->smb_conn->lp_ctx)); + SSVAL(req->out.vwv, VWV(3), lpcfg_max_mux(req->smb_conn->lp_ctx)); SSVAL(req->out.vwv, VWV(4), 1); SSVAL(req->out.vwv, VWV(5), raw); SIVAL(req->out.vwv, VWV(6), req->smb_conn->connection->server_id.pid); @@ -315,7 +315,7 @@ static void reply_nt1(struct smbsrv_request *req, uint16_t choice) this is the one and only SMB packet that is malformed in the specification - all the command words after the secword are offset by 1 byte */ - SSVAL(req->out.vwv+1, VWV(1), lpcfg_maxmux(req->smb_conn->lp_ctx)); + SSVAL(req->out.vwv+1, VWV(1), lpcfg_max_mux(req->smb_conn->lp_ctx)); SSVAL(req->out.vwv+1, VWV(2), 1); /* num vcs */ SIVAL(req->out.vwv+1, VWV(3), req->smb_conn->negotiate.max_recv); SIVAL(req->out.vwv+1, VWV(5), 0x10000); /* raw size. full 64k */ |