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>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 6374ae6da4cc4546acd16fabfcae53c1b71282c4..9f689da54037db009c2065de03ced9f9e7a69338 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -312,7 +312,7 @@ FN_GLOBAL_INTEGER(mangle_prefix, mangle_prefix)
 FN_GLOBAL_INTEGER(map_to_guest, map_to_guest)
 FN_GLOBAL_INTEGER(maxdisksize, maxdisksize)
 FN_GLOBAL_INTEGER(max_log_size, max_log_size)
-FN_GLOBAL_INTEGER(maxmux, maxmux)
+FN_GLOBAL_INTEGER(max_mux, max_mux)
 FN_GLOBAL_INTEGER(max_open_files, max_open_files)
 FN_GLOBAL_INTEGER(max_smbd_processes, max_smbd_processes)
 FN_GLOBAL_INTEGER(max_stat_cache_size, max_stat_cache_size)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 59d62867864040570a42d4a66a95cc772af99283..3b4736aa121205895e133ccc29684e17c34789c2 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1519,7 +1519,7 @@ static struct parm_struct parm_table[] = {
                .label          = "max mux",
                .type           = P_INTEGER,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(maxmux),
+               .offset         = GLOBAL_VAR(max_mux),
                .special        = NULL,
                .enum_list      = NULL,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8f6d7756cf93afa7324b6bf60dc5e1ba9ddfef10..c4068546fd73d0721519a18f165a8803a8e5f2db 100644 (file)
--- 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 315bd890376888186cd15f5751db8b21c67c99a6..d00b35436913270b6033382b8cca1709123e6020 100644 (file)
--- 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! */

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index faf2f4ddb4db52ec360cf90d4c0198931f74afc6..529c828e09b308096b3dcdc81088967f1a3a8a0f 100644 (file)
--- 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 7c1d3a70767ca0b27c6db9b93d25f23636088b2d..fa2a6d2a4ad3a1538a51b4f9ecc29b2f4a4074d6 100644 (file)
--- 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 */