diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-02-27 14:24:30 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-02-27 07:36:05 +0100 |
| commit | c318c94170d58aeaa34f00e06fbf960816f7d0d9 (patch) | |
| tree | a81232d7fa943db0c94f8d0b13f529c7eebd1801 /source3/param | |
| parent | d21f7783f6062118edf2c7b8dab79ebc5459317a (diff) | |
| download | samba-c318c94170d58aeaa34f00e06fbf960816f7d0d9.tar.gz samba-c318c94170d58aeaa34f00e06fbf960816f7d0d9.tar.bz2 samba-c318c94170d58aeaa34f00e06fbf960816f7d0d9.zip | |
s3-param: Align lp_{max,min}protocol with lib/param names
This adds an alisas to ensure that both our loadparm systems know all
the names.
I would like to move to the 'server ..' name as canonical, and this
will be raised on the list.
Andrew Bartlett
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 38 | ||||
| -rw-r--r-- | source3/param/loadparm_ctx.c | 3 |
2 files changed, 31 insertions, 10 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 20a072d67f..382a273f38 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -1549,7 +1549,16 @@ static struct parm_struct parm_table[] = { .label = "max protocol", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(maxprotocol), + .offset = GLOBAL_VAR(srv_maxprotocol), + .special = NULL, + .enum_list = enum_protocol, + .flags = FLAG_ADVANCED, + }, + { + .label = "server max protocol", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(srv_maxprotocol), .special = NULL, .enum_list = enum_protocol, .flags = FLAG_ADVANCED, @@ -1558,7 +1567,7 @@ static struct parm_struct parm_table[] = { .label = "protocol", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(maxprotocol), + .offset = GLOBAL_VAR(srv_maxprotocol), .special = NULL, .enum_list = enum_protocol, .flags = FLAG_ADVANCED, @@ -1567,7 +1576,16 @@ static struct parm_struct parm_table[] = { .label = "min protocol", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(minprotocol), + .offset = GLOBAL_VAR(srv_minprotocol), + .special = NULL, + .enum_list = enum_protocol, + .flags = FLAG_ADVANCED, + }, + { + .label = "server min protocol", + .type = P_ENUM, + .p_class = P_GLOBAL, + .offset = GLOBAL_VAR(srv_minprotocol), .special = NULL, .enum_list = enum_protocol, .flags = FLAG_ADVANCED, @@ -4748,8 +4766,8 @@ static void init_globals(bool reinit_globals) Globals.max_log_size = 5000; Globals.max_open_files = max_open_files(); Globals.open_files_db_hash_size = SMB_OPEN_DATABASE_TDB_HASH_SIZE; - Globals.maxprotocol = PROTOCOL_NT1; - Globals.minprotocol = PROTOCOL_CORE; + Globals.srv_maxprotocol = PROTOCOL_NT1; + Globals.srv_minprotocol = PROTOCOL_CORE; Globals.security = SEC_USER; Globals.paranoid_server_security = true; Globals.bEncryptPasswords = true; @@ -5268,19 +5286,19 @@ FN_GLOBAL_INTEGER(lp_passwordlevel, pwordlevel) FN_GLOBAL_INTEGER(lp_usernamelevel, unamelevel) FN_GLOBAL_INTEGER(lp_deadtime, deadtime) FN_GLOBAL_BOOL(lp_getwd_cache, getwd_cache) -static FN_GLOBAL_INTEGER(_lp_maxprotocol, maxprotocol) -int lp_maxprotocol(void) +static FN_GLOBAL_INTEGER(_lp_srv_maxprotocol, srv_maxprotocol) +int lp_srv_maxprotocol(void) { - int ret = _lp_maxprotocol(); + int ret = _lp_srv_maxprotocol(); if ((ret >= PROTOCOL_SMB2_02) && (lp_security() == SEC_SHARE)) { DEBUG(2,("WARNING!!: \"security = share\" is incompatible " "with the SMB2 protocol. Resetting to SMB1.\n" )); - lp_do_parameter(-1, "max protocol", "NT1"); + lp_do_parameter(-1, "server max protocol", "NT1"); return PROTOCOL_NT1; } return ret; } -FN_GLOBAL_INTEGER(lp_minprotocol, minprotocol) +FN_GLOBAL_INTEGER(lp_srv_minprotocol, srv_minprotocol) FN_GLOBAL_INTEGER(lp_security, security) FN_GLOBAL_LIST(lp_auth_methods, AuthMethods) FN_GLOBAL_BOOL(lp_paranoid_server_security, paranoid_server_security) diff --git a/source3/param/loadparm_ctx.c b/source3/param/loadparm_ctx.c index e1bbda3928..57ffb87344 100644 --- a/source3/param/loadparm_ctx.c +++ b/source3/param/loadparm_ctx.c @@ -110,6 +110,9 @@ static const struct loadparm_s3_context s3_fns = .unix_extensions = lp_unix_extensions, .use_spnego = lp_use_spnego, .use_mmap = lp_use_mmap, + + .srv_minprotocol = lp_srv_minprotocol, + .srv_maxprotocol = lp_srv_maxprotocol, }; const struct loadparm_s3_context *loadparm_s3_context(void) |