param: rename lp function and variable from "srv_minprotocol" to "server_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 81b33e0258e5e0c4ccc9cae1939eef6a0d6bc6da..b307e0cca14e789d9e6de91db0fac63a37a9a3f3 100644 (file)
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -335,7 +335,7 @@ FN_GLOBAL_INTEGER(smb2_max_read, smb2_max_read)
 FN_GLOBAL_INTEGER(smb2_max_trans, smb2_max_trans)
 FN_GLOBAL_INTEGER(smb2_max_write, smb2_max_write)
 FN_GLOBAL_INTEGER(server_max_protocol, server_max_protocol)
-FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
+FN_GLOBAL_INTEGER(server_min_protocol, server_min_protocol)
 FN_GLOBAL_INTEGER(syslog, syslog)
 FN_GLOBAL_INTEGER(usernamelevel, usernamelevel)
 FN_GLOBAL_INTEGER(username_map_cache_time, username_map_cache_time)

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index bd94553f8bdfeac12ab7dbe8b89f78a80ddc0da3..1ae0a2c754c76b3ee863f67de18b773d49ae7c20 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1349,7 +1349,7 @@ static struct parm_struct parm_table[] = {
                .label          = "server min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_minprotocol),
+               .offset         = GLOBAL_VAR(server_min_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,
@@ -1358,7 +1358,7 @@ static struct parm_struct parm_table[] = {
                .label          = "min protocol",
                .type           = P_ENUM,
                .p_class        = P_GLOBAL,
-               .offset         = GLOBAL_VAR(srv_minprotocol),
+               .offset         = GLOBAL_VAR(server_min_protocol),
                .special        = NULL,
                .enum_list      = enum_protocol,
                .flags          = FLAG_ADVANCED,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 48b8bbdce188c465475ca632dd59c47291a73a63..aaddd4867f30fa1aadd195e625f85240c19f3ee6 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -820,7 +820,7 @@ static void init_globals(bool reinit_globals)
        Globals.max_log_size = 5000;
        Globals.max_open_files = max_open_files();
        Globals.server_max_protocol = PROTOCOL_SMB3_00;
-       Globals.srv_minprotocol = PROTOCOL_LANMAN1;
+       Globals.server_min_protocol = PROTOCOL_LANMAN1;
        Globals.client_max_protocol = PROTOCOL_NT1;
        Globals.client_min_protocol = PROTOCOL_CORE;
        Globals._security = SEC_AUTO;

diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index 2fcf73cd7436c95dc7d4f4b293bbe32092fc366c..ac828a94decf17fe6c6c4fd179b17d1034a246b7 100644 (file)
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -652,7 +652,7 @@ void reply_negprot(struct smb_request *req)
        for (protocol = 0; supported_protocols[protocol].proto_name; protocol++) {
                i = 0;
                if ((supported_protocols[protocol].protocol_level <= lp_server_max_protocol()) &&
-                               (supported_protocols[protocol].protocol_level >= lp_srv_minprotocol()))
+                               (supported_protocols[protocol].protocol_level >= lp_server_min_protocol()))
                        while (i < num_cliprotos) {
                                if (strequal(cliprotos[i],supported_protocols[protocol].proto_name)) {
                                        choice = i;

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index b48524c38b1e52fb645d3ecb0101baee67976798..b1e71e63b596b2b7964b4633513216cb1ac05f57 100644 (file)
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -142,7 +142,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
                if (lp_server_max_protocol() < PROTOCOL_SMB3_00) {
                        break;
                }
-               if (lp_srv_minprotocol() > PROTOCOL_SMB3_00) {
+               if (lp_server_min_protocol() > PROTOCOL_SMB3_00) {
                        break;
                }
 
@@ -157,7 +157,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
                if (lp_server_max_protocol() < PROTOCOL_SMB2_24) {
                        break;
                }
-               if (lp_srv_minprotocol() > PROTOCOL_SMB2_24) {
+               if (lp_server_min_protocol() > PROTOCOL_SMB2_24) {
                        break;
                }
 
@@ -172,7 +172,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
                if (lp_server_max_protocol() < PROTOCOL_SMB2_22) {
                        break;
                }
-               if (lp_srv_minprotocol() > PROTOCOL_SMB2_22) {
+               if (lp_server_min_protocol() > PROTOCOL_SMB2_22) {
                        break;
                }
 
@@ -187,7 +187,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
                if (lp_server_max_protocol() < PROTOCOL_SMB2_10) {
                        break;
                }
-               if (lp_srv_minprotocol() > PROTOCOL_SMB2_10) {
+               if (lp_server_min_protocol() > PROTOCOL_SMB2_10) {
                        break;
                }
 
@@ -202,7 +202,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
                if (lp_server_max_protocol() < PROTOCOL_SMB2_02) {
                        break;
                }
-               if (lp_srv_minprotocol() > PROTOCOL_SMB2_02) {
+               if (lp_server_min_protocol() > PROTOCOL_SMB2_02) {
                        break;
                }
 

diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index 4a40376b39543476b23d2af11ad103846f9bd119..37933cd760dbd6502d5c04e48819394f94282a44 100644 (file)
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -504,7 +504,7 @@ void smbsrv_reply_negprot(struct smbsrv_request *req)
 
                if (supported_protocols[protocol].protocol_level > lpcfg_server_max_protocol(req->smb_conn->lp_ctx))
                        continue;
-               if (supported_protocols[protocol].protocol_level < lpcfg_srv_minprotocol(req->smb_conn->lp_ctx))
+               if (supported_protocols[protocol].protocol_level < lpcfg_server_min_protocol(req->smb_conn->lp_ctx))
                        continue;
 
                for (i = 0; i < protos_count; i++) {