param: Rename variable used for lp__domain_master domain_master

Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c
index 2b6f0297c512beb38af5daee7f6d5b3c05b030c9..bae5bae32f12fdd50b5ba396deaa5399c3096861 100644 (file)
--- 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 25f2ed0e29abb23a94a1130d5135550369c71793..bc1cd0dfe93fa8f6d78045807cee7adf0eb00672 100644 (file)
--- 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 1758c95c3f426736e36a40ac3fcd6e2e0d99e442..8af8d4eee8a7e3acd31deaf9a6046f0def9bec2d 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -945,7 +945,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;
@@ -5268,10 +5268,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;
 }
 
 /***********************************************************
@@ -5280,7 +5280,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;