sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

param: rename lp function and variable from "srv_minprotocol" to "server_min_protocol"

Browse Source 
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Garming Sam 2014-02-04 15:09:09 +13:00 committed by Jeremy Allison
parent 64dc4b59f8
commit fc111c7875
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/param/param_functions.c
View File

@ -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)

4
lib/param/param_table.c
View File

@ -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,

2
source3/param/loadparm.c
View File

@ -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;

2
source3/smbd/negprot.c
View File

@ -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;

10
source3/smbd/smb2_negprot.c
View File

@ -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;
}

2
source4/smb_server/smb/negprot.c
View File

@ -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++) {