param: rename iPreferredMaster -> _preferred_master
authorMichael Adam <obnox@samba.org>
Tue, 21 Jul 2015 12:07:25 +0000 (14:07 +0200)
committerJeremy Allison <jra@samba.org>
Thu, 30 Jul 2015 23:55:30 +0000 (01:55 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
lib/param/loadparm.h
lib/param/param_table.c
source3/param/loadparm.c

index 933931f..c49d131 100644 (file)
@@ -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;                                           \
index a6a96d4..4edd167 100644 (file)
@@ -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,
index 28dba05..8c724bc 100644 (file)
@@ -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;
 }
 
 /*******************************************************************