sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

param: turn 'preferred master' into a generated function

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:09:35 +02:00
committed by Jeremy Allison
parent 20c84b8d03
commit 217ce6d93b
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs-xml/smbdotconf/browse/preferredmaster.xml
View File

@ -2,7 +2,7 @@
context="G" context="G"
type="enum" type="enum"
enumlist="enum_bool_auto" enumlist="enum_bool_auto"
generated_function="0" function="_preferred_master"
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<synonym>prefered master</synonym> <synonym>prefered master</synonym>
<description> <description>

1
lib/param/loadparm.h
View File

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

6
source3/param/loadparm.c
View File

@ -4101,10 +4101,12 @@ static bool lp_domain_master_true_or_auto(void)
bool lp_preferred_master(void) bool lp_preferred_master(void)
{ {
if (Globals._preferred_master == Auto) int preferred_master = lp__preferred_master();
if (preferred_master == Auto)
return (lp_local_master() && lp_domain_master()); return (lp_local_master() && lp_domain_master());
return (bool)Globals._preferred_master; return (bool)preferred_master;
} }
/******************************************************************* /*******************************************************************