From fc111c7875e35c846dbe52f7d3dbce75cfc74336 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Tue, 4 Feb 2014 15:09:09 +1300 Subject: param: rename lp function and variable from "srv_minprotocol" to "server_min_protocol" Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- source3/param/loadparm.c | 2 +- source3/smbd/negprot.c | 2 +- source3/smbd/smb2_negprot.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source3') diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 48b8bbdce1..aaddd4867f 100644 --- 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 2fcf73cd74..ac828a94de 100644 --- 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 b48524c38b..b1e71e63b5 100644 --- 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; } -- cgit