param: rename lp function and variable from "srv_maxprotocol" to "server_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>

8 files changed, 15 insertions, 15 deletions

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 9f689da540..81b33e0258 100644
--- a/lib/param/param_functions.c
+++ b/lib/param/param_functions.c
@@ -334,7 +334,7 @@ FN_GLOBAL_INTEGER(server_signing, server_signing)
 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(srv_maxprotocol, srv_maxprotocol)
+FN_GLOBAL_INTEGER(server_max_protocol, server_max_protocol)
 FN_GLOBAL_INTEGER(srv_minprotocol, srv_minprotocol)
 FN_GLOBAL_INTEGER(syslog, syslog)
 FN_GLOBAL_INTEGER(usernamelevel, usernamelevel)
diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index 3b4736aa12..bd94553f8b 100644
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -1322,7 +1322,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "server max protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
+		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1331,7 +1331,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "max protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
+		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
@@ -1340,7 +1340,7 @@ static struct parm_struct parm_table[] = {
 		.label		= "protocol",
 		.type		= P_ENUM,
 		.p_class	= P_GLOBAL,
-		.offset		= GLOBAL_VAR(srv_maxprotocol),
+		.offset		= GLOBAL_VAR(server_max_protocol),
 		.special	= NULL,
 		.enum_list	= enum_protocol,
 		.flags		= FLAG_ADVANCED,
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c4068546fd..48b8bbdce1 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -819,7 +819,7 @@ static void init_globals(bool reinit_globals)
 	Globals.large_readwrite = true;
 	Globals.max_log_size = 5000;
 	Globals.max_open_files = max_open_files();
-	Globals.srv_maxprotocol = PROTOCOL_SMB3_00;
+	Globals.server_max_protocol = PROTOCOL_SMB3_00;
 	Globals.srv_minprotocol = PROTOCOL_LANMAN1;
 	Globals.client_max_protocol = PROTOCOL_NT1;
 	Globals.client_min_protocol = PROTOCOL_CORE;
diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c
index d00b354369..2fcf73cd74 100644
--- a/source3/smbd/negprot.c
+++ b/source3/smbd/negprot.c
@@ -651,7 +651,7 @@ void reply_negprot(struct smb_request *req)
 	/* Check for protocols, most desirable first */
 	for (protocol = 0; supported_protocols[protocol].proto_name; protocol++) {
 		i = 0;
-		if ((supported_protocols[protocol].protocol_level <= lp_srv_maxprotocol()) &&
+		if ((supported_protocols[protocol].protocol_level <= lp_server_max_protocol()) &&
 				(supported_protocols[protocol].protocol_level >= lp_srv_minprotocol()))
 			while (i < num_cliprotos) {
 				if (strequal(cliprotos[i],supported_protocols[protocol].proto_name)) {
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 6d7af26a6e..1e1b8738b4 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3374,7 +3374,7 @@ void smbd_process(struct tevent_context *ev_ctx,
 		}
 	}
 
-	if (lp_srv_maxprotocol() >= PROTOCOL_SMB2_02) {
+	if (lp_server_max_protocol() >= PROTOCOL_SMB2_02) {
 		/*
 		 * We're not making the decision here,
 		 * we're just allowing the client
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 963a557253..b48524c38b 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -139,7 +139,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	indyn = SMBD_SMB2_IN_DYN_PTR(req);
 
 	for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) {
-		if (lp_srv_maxprotocol() < PROTOCOL_SMB3_00) {
+		if (lp_server_max_protocol() < PROTOCOL_SMB3_00) {
 			break;
 		}
 		if (lp_srv_minprotocol() > PROTOCOL_SMB3_00) {
@@ -154,7 +154,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	}
 
 	for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) {
-		if (lp_srv_maxprotocol() < PROTOCOL_SMB2_24) {
+		if (lp_server_max_protocol() < PROTOCOL_SMB2_24) {
 			break;
 		}
 		if (lp_srv_minprotocol() > PROTOCOL_SMB2_24) {
@@ -169,7 +169,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	}
 
 	for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) {
-		if (lp_srv_maxprotocol() < PROTOCOL_SMB2_22) {
+		if (lp_server_max_protocol() < PROTOCOL_SMB2_22) {
 			break;
 		}
 		if (lp_srv_minprotocol() > PROTOCOL_SMB2_22) {
@@ -184,7 +184,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	}
 
 	for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) {
-		if (lp_srv_maxprotocol() < PROTOCOL_SMB2_10) {
+		if (lp_server_max_protocol() < PROTOCOL_SMB2_10) {
 			break;
 		}
 		if (lp_srv_minprotocol() > PROTOCOL_SMB2_10) {
@@ -199,7 +199,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	}
 
 	for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) {
-		if (lp_srv_maxprotocol() < PROTOCOL_SMB2_02) {
+		if (lp_server_max_protocol() < PROTOCOL_SMB2_02) {
 			break;
 		}
 		if (lp_srv_minprotocol() > PROTOCOL_SMB2_02) {
@@ -214,7 +214,7 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
 	}
 
 	for (c=0; protocol == PROTOCOL_NONE && c < dialect_count; c++) {
-		if (lp_srv_maxprotocol() < PROTOCOL_SMB2_10) {
+		if (lp_server_max_protocol() < PROTOCOL_SMB2_10) {
 			break;
 		}
 
diff --git a/source4/smb_server/smb/negprot.c b/source4/smb_server/smb/negprot.c
index fa2a6d2a4a..4a40376b39 100644
--- a/source4/smb_server/smb/negprot.c
+++ b/source4/smb_server/smb/negprot.c
@@ -502,7 +502,7 @@ void smbsrv_reply_negprot(struct smbsrv_request *req)
 	for (protocol = 0; supported_protocols[protocol].proto_name; protocol++) {
 		int i;
 
-		if (supported_protocols[protocol].protocol_level > lpcfg_srv_maxprotocol(req->smb_conn->lp_ctx))
+		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))
 			continue;
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index 270e107c06..7e4c032ab4 100644
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -63,7 +63,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private_data, DATA_BLOB blob)
 		packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request);
 		return smbsrv_recv_smb_request(smb_conn, blob);
 	case SMB2_MAGIC:
-		if (lpcfg_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2_02) break;
+		if (lpcfg_server_max_protocol(smb_conn->lp_ctx) < PROTOCOL_SMB2_02) break;
 		status = smbsrv_init_smb2_connection(smb_conn);
 		NT_STATUS_NOT_OK_RETURN(status);
 		packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request);