From 20c84b8d03fffb92e26e69f7284e36b1b6dccf3b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 21 Jul 2015 14:07:25 +0200 Subject: [PATCH] param: rename iPreferredMaster -> _preferred_master Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- lib/param/loadparm.h | 2 +- lib/param/param_table.c | 4 ++-- source3/param/loadparm.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index 933931f627a..c49d1314f95 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -252,7 +252,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; int iminreceivefile; \ char *szPrintcapname; \ int CupsEncrypt; \ - int iPreferredMaster; \ + int _preferred_master; \ char *szIdmapUID; \ char *szIdmapGID; \ char *szIdmapBackend; \ diff --git a/lib/param/param_table.c b/lib/param/param_table.c index a6a96d467e6..4edd1676e8e 100644 --- a/lib/param/param_table.c +++ b/lib/param/param_table.c @@ -2576,7 +2576,7 @@ struct parm_struct parm_table[] = { .label = "preferred master", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(iPreferredMaster), + .offset = GLOBAL_VAR(_preferred_master), .special = NULL, .enum_list = enum_bool_auto, }, @@ -2584,7 +2584,7 @@ struct parm_struct parm_table[] = { .label = "prefered master", .type = P_ENUM, .p_class = P_GLOBAL, - .offset = GLOBAL_VAR(iPreferredMaster), + .offset = GLOBAL_VAR(_preferred_master), .special = NULL, .enum_list = enum_bool_auto, .flags = FLAG_SYNONYM, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 28dba050494..8c724bc727d 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -876,7 +876,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) string_set(Globals.ctx, &Globals.share_backend, "classic"); - Globals.iPreferredMaster = Auto; + Globals._preferred_master = Auto; Globals.allow_dns_updates = DNS_UPDATE_SIGNED; @@ -4101,10 +4101,10 @@ static bool lp_domain_master_true_or_auto(void) bool lp_preferred_master(void) { - if (Globals.iPreferredMaster == Auto) + if (Globals._preferred_master == Auto) return (lp_local_master() && lp_domain_master()); - return (bool)Globals.iPreferredMaster; + return (bool)Globals._preferred_master; } /******************************************************************* -- 2.11.4.GIT