sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

param: rename iPreferredMaster -> _preferred_master

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Michael Adam 2015-07-21 14:07:25 +02:00 committed by Jeremy Allison
parent c377f63026
commit 20c84b8d03
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/loadparm.h
View File

@ -252,7 +252,7 @@ enum case_handling {CASE_LOWER,CASE_UPPER};
int iminreceivefile; \ int iminreceivefile; \
char *szPrintcapname; \ char *szPrintcapname; \
int CupsEncrypt; \ int CupsEncrypt; \
int iPreferredMaster; \ int _preferred_master; \
char *szIdmapUID; \ char *szIdmapUID; \
char *szIdmapGID; \ char *szIdmapGID; \
char *szIdmapBackend; \ char *szIdmapBackend; \

4
lib/param/param_table.c
View File

@ -2576,7 +2576,7 @@ struct parm_struct parm_table[] = {
.label = "preferred master", .label = "preferred master",
.type = P_ENUM, .type = P_ENUM,
.p_class = P_GLOBAL, .p_class = P_GLOBAL,
.offset = GLOBAL_VAR(iPreferredMaster), .offset = GLOBAL_VAR(_preferred_master),
.special = NULL, .special = NULL,
.enum_list = enum_bool_auto, .enum_list = enum_bool_auto,
}, },
@ -2584,7 +2584,7 @@ struct parm_struct parm_table[] = {
.label = "prefered master", .label = "prefered master",
.type = P_ENUM, .type = P_ENUM,
.p_class = P_GLOBAL, .p_class = P_GLOBAL,
.offset = GLOBAL_VAR(iPreferredMaster), .offset = GLOBAL_VAR(_preferred_master),
.special = NULL, .special = NULL,
.enum_list = enum_bool_auto, .enum_list = enum_bool_auto,
.flags = FLAG_SYNONYM, .flags = FLAG_SYNONYM,

6
source3/param/loadparm.c
View 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"); string_set(Globals.ctx, &Globals.share_backend, "classic");
Globals.iPreferredMaster = Auto; Globals._preferred_master = Auto;
Globals.allow_dns_updates = DNS_UPDATE_SIGNED; 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) bool lp_preferred_master(void)
{ {
if (Globals.iPreferredMaster == Auto) if (Globals._preferred_master == Auto)
return (lp_local_master() && lp_domain_master()); return (lp_local_master() && lp_domain_master());
return (bool)Globals.iPreferredMaster; return (bool)Globals._preferred_master;
} }
/******************************************************************* /*******************************************************************