param: rename lp function and variable from "cli_maxprotocol" to "client_max_protocol"

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 ad105a07329066a54305245572cfc4189bcb3c7f..9a30a5d720ec73348e30c04e0c7c370062b49922 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -277,7 +277,7 @@ FN_GLOBAL_INTEGER(cldap_port, cldap_port)
 FN_GLOBAL_INTEGER(client_ldap_sasl_wrapping, client_ldap_sasl_wrapping)
 FN_GLOBAL_INTEGER(client_schannel, client_schannel)
 FN_GLOBAL_INTEGER(client_signing, client_signing)
-FN_GLOBAL_INTEGER(cli_maxprotocol, cli_maxprotocol)
+FN_GLOBAL_INTEGER(client_max_protocol, client_max_protocol)
 FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
 FN_GLOBAL_INTEGER(config_backend, config_backend)
 FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index dd1693fd89321a076523ed9ec4e8fabcf90087b4..321eeb9819e1013699f7c7dce2489954a84d917c 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1367,7 +1367,7 @@ static struct parm_struct parm_table[] = {
                .label          = "client max protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(cli_maxprotocol),
+               .offset         = GLOBAL_VAR(client_max_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/client/client.c b/source3/client/client.c
index 2ed47c4b0938874c02540a7a57b4927cb5304b9b..16cbfe89079b801bca3b7fdb818bd35f46d04cc5 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -5624,7 +5624,7 @@ static int do_message_op(struct user_auth_info *a_info)
        /* Ensure we have a password (or equivalent). */
        set_cmdline_auth_info_getpass(auth_info);
 
-       max_protocol = lp_cli_maxprotocol();
+       max_protocol = lp_client_max_protocol();
 
        if (tar_type) {
                if (cmdstr)

diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index dbb6b6f02d181f6e9499c0d1341d695ea0de8462..801e61f4a4542ca68308fa437b2650c61f70337f 100644 (file)
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -111,7 +111,7 @@ static WERROR libnetapi_open_ipc_connection(struct libnetapi_ctx *ctx,
                             server_name, "IPC$",
                             auth_info,
                             false, false,
-                            lp_cli_maxprotocol(),
+                            lp_client_max_protocol(),
                             0, 0x20, &cli_ipc);
        if (NT_STATUS_IS_OK(status)) {
                cli_set_username(cli_ipc, ctx->username);

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 964d5fd91bce1dbcc9599488f82d1c8b0e22d0b2..cae5443472924d82ae4cde7e408ee1ae31e08952 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3148,7 +3148,7 @@ static void cli_start_connection_connected(struct tevent_req *subreq)
        subreq = smbXcli_negprot_send(state, state->ev, state->cli->conn,
                                      state->cli->timeout,
                                      lp_cli_minprotocol(),
-                                     lp_cli_maxprotocol());
+                                     lp_client_max_protocol());
        if (tevent_req_nomem(subreq, req)) {
                return;
        }

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 2f3ea96602611fbea651910c02a104c411d37f02..c5159fc72c69bf5e5f35e2f822f976c435b60e0c 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -452,7 +452,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
 
        status = smbXcli_negprot(c->conn, c->timeout,
                                 lp_cli_minprotocol(),
-                                lp_cli_maxprotocol());
+                                lp_client_max_protocol());
        if (!NT_STATUS_IS_OK(status)) {
                cli_shutdown(c);
                errno = ETIMEDOUT;

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 66da386e06a837adbc5651794534c7bfde3e7623..6788d66c92e50bcecb5984640ba21f2a1ed67201 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -821,7 +821,7 @@ static void init_globals(bool reinit_globals)
        Globals.max_open_files = max_open_files();
        Globals.srv_maxprotocol = PROTOCOL_SMB3_00;
        Globals.srv_minprotocol = PROTOCOL_LANMAN1;
-       Globals.cli_maxprotocol = PROTOCOL_NT1;
+       Globals.client_max_protocol = PROTOCOL_NT1;
        Globals.cli_minprotocol = PROTOCOL_CORE;
        Globals._security = SEC_AUTO;
        Globals.encrypted_passwords = true;

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index bca35aa4bf2bf962b81bee9dc445dca66bfaac5d..a13f6a0113e7bbed15f8e5ac2ba7687da4bb35df 100644 (file)
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -548,7 +548,7 @@ static void usage(void)
        argc -= optind;
        argv += optind;
 
-       max_protocol = lp_cli_maxprotocol();
+       max_protocol = lp_client_max_protocol();
 
        cli = connect_one(share);
        if (!cli) {

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index fcca94ab1219bb693dc2726ccdd2cb36218a2876..9e5adf11f0b3bab6a68449aa4b0b991a03dd230c 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -906,7 +906,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
 
        result = smbXcli_negprot((*cli)->conn, (*cli)->timeout,
                                 lp_cli_minprotocol(),
-                                lp_cli_maxprotocol());
+                                lp_client_max_protocol());
 
        if (!NT_STATUS_IS_OK(result)) {
                DEBUG(1, ("cli_negprot failed: %s\n", nt_errstr(result)));

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 5f4f4181ccd4e9a09334049564905e618ca1434a..faf2f4ddb4db52ec360cf90d4c0198931f74afc6 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -40,7 +40,7 @@ void lpcfg_smbcli_options(struct loadparm_context *lp_ctx,
        options->signing = lpcfg_client_signing(lp_ctx);
        options->request_timeout = SMB_REQUEST_TIMEOUT;
        options->ntstatus_support = lpcfg_nt_status_support(lp_ctx);
-       options->max_protocol = lpcfg_cli_maxprotocol(lp_ctx);
+       options->max_protocol = lpcfg_client_max_protocol(lp_ctx);
        options->unicode = lpcfg_unicode(lp_ctx);
        options->use_oplocks = true;
        options->use_level2_oplocks = true;