param: rename lp function and variable from "cli_minprotocol" to "client_min_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 9a30a5d720ec73348e30c04e0c7c370062b49922..6374ae6da4cc4546acd16fabfcae53c1b71282c4 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -278,7 +278,7 @@ 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(client_max_protocol, client_max_protocol)
-FN_GLOBAL_INTEGER(cli_minprotocol, cli_minprotocol)
+FN_GLOBAL_INTEGER(client_min_protocol, client_min_protocol)
 FN_GLOBAL_INTEGER(config_backend, config_backend)
 FN_GLOBAL_INTEGER(ctdb_locktime_warn_threshold, ctdb_locktime_warn_threshold)
 FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)

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

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index cae5443472924d82ae4cde7e408ee1ae31e08952..6ca3bab82887d1707254cf49a04e60d8218488da 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3147,7 +3147,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_client_min_protocol(),
                                      lp_client_max_protocol());
        if (tevent_req_nomem(subreq, req)) {
                return;

diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c
index ff48719c76b6b94717b6d9b5047e23ab4f834bde..80fba23f67bb376c147a52055d2b7dfe9454541e 100644 (file)
--- a/source3/libsmb/clidfs.c
+++ b/source3/libsmb/clidfs.c
@@ -167,7 +167,7 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx,
        DEBUG(4,(" session request ok\n"));
 
        status = smbXcli_negprot(c->conn, c->timeout,
-                                lp_cli_minprotocol(),
+                                lp_client_min_protocol(),
                                 max_protocol);
 
        if (!NT_STATUS_IS_OK(status)) {

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index c5159fc72c69bf5e5f35e2f822f976c435b60e0c..3b7214c9554b0cc7de8adec7a1ca6f22c48b64cc 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -451,7 +451,7 @@ SMBC_server_internal(TALLOC_CTX *ctx,
        cli_set_timeout(c, smbc_getTimeout(context));
 
        status = smbXcli_negprot(c->conn, c->timeout,
-                                lp_cli_minprotocol(),
+                                lp_client_min_protocol(),
                                 lp_client_max_protocol());
        if (!NT_STATUS_IS_OK(status)) {
                cli_shutdown(c);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 6788d66c92e50bcecb5984640ba21f2a1ed67201..8f6d7756cf93afa7324b6bf60dc5e1ba9ddfef10 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -822,7 +822,7 @@ static void init_globals(bool reinit_globals)
        Globals.srv_maxprotocol = PROTOCOL_SMB3_00;
        Globals.srv_minprotocol = PROTOCOL_LANMAN1;
        Globals.client_max_protocol = PROTOCOL_NT1;
-       Globals.cli_minprotocol = PROTOCOL_CORE;
+       Globals.client_min_protocol = PROTOCOL_CORE;
        Globals._security = SEC_AUTO;
        Globals.encrypted_passwords = true;
        Globals.client_schannel = Auto;

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 9e5adf11f0b3bab6a68449aa4b0b991a03dd230c..669a43e5ac35e771b6d081180ef4f7711a110c40 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -905,7 +905,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
        cli_set_timeout(*cli, 10000); /* 10 seconds */
 
        result = smbXcli_negprot((*cli)->conn, (*cli)->timeout,
-                                lp_cli_minprotocol(),
+                                lp_client_min_protocol(),
                                 lp_client_max_protocol());
 
        if (!NT_STATUS_IS_OK(result)) {