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

param: Rename variable used for lp__domain_master domain_master

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

2
lib/param/param_functions.c
View File

@ -285,7 +285,7 @@ FN_GLOBAL_INTEGER(ctdb_timeout, ctdb_timeout)
FN_GLOBAL_INTEGER(cups_connection_timeout, cups_connection_timeout)
FN_GLOBAL_INTEGER(deadtime, deadtime)
FN_GLOBAL_INTEGER(dgram_port, dgram_port)
FN_GLOBAL_INTEGER(_domain_master, domain_master)
FN_GLOBAL_INTEGER(_domain_master, _domain_master)
FN_GLOBAL_INTEGER(idmap_cache_time, idmap_cache_time)
FN_GLOBAL_INTEGER(idmap_negative_cache_time, idmap_negative_cache_time)
FN_GLOBAL_INTEGER(init_logon_delay, init_logon_delay)

2
lib/param/param_table.c
View File

@ -2833,7 +2833,7 @@ static struct parm_struct parm_table[] = {
.label = "domain master",
.type = P_ENUM,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(domain_master),
.offset = GLOBAL_VAR(_domain_master),
.special = NULL,
.enum_list = enum_bool_auto,
.flags = FLAG_BASIC | FLAG_ADVANCED,

8
source3/param/loadparm.c
View File

@ -944,7 +944,7 @@ static void init_globals(bool reinit_globals)
Globals.ms_add_printer_wizard = true;
Globals.os_level = 20;
Globals.local_master = true;
Globals.domain_master = Auto; /* depending on _domain_logons */
Globals._domain_master = Auto; /* depending on _domain_logons */
Globals._domain_logons = false;
Globals.browse_list = true;
Globals.we_are_a_wins_server = false;
@ -5219,10 +5219,10 @@ int lp_default_server_announce(void)
bool lp_domain_master(void)
{
if (Globals.domain_master == Auto)
if (Globals._domain_master == Auto)
return (lp_server_role() == ROLE_DOMAIN_PDC);
return (bool)Globals.domain_master;
return (bool)Globals._domain_master;
}
/***********************************************************
@ -5231,7 +5231,7 @@ bool lp_domain_master(void)
static bool lp_domain_master_true_or_auto(void)
{
if (Globals.domain_master) /* auto or yes */
if (Globals._domain_master) /* auto or yes */
return true;
return false;