From 02f35234f01b33493e9429e8b8b2fec1d02707ca Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Fri, 10 Jan 2014 11:21:46 +1300 Subject: [PATCH] param: Rename variable used for lp__domain_master domain_master Signed-off-by: Garming Sam Signed-off-by: Andrew Bartlett Reviewed-by: Jeremy Allison --- lib/param/param_functions.c | 2 +- lib/param/param_table.c | 2 +- source3/param/loadparm.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 88889982a4b..5cbaf421559 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -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) diff --git a/lib/param/param_table.c b/lib/param/param_table.c index 768f6326474..726305c98e7 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -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, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 487fe3fb6c7..3be515b5b61 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -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;