From 217ce6d93bb8c6e7fea3deb00c5b39ea2f6d11b9 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 21 Jul 2015 14:09:35 +0200 Subject: [PATCH] param: turn 'preferred master' into a generated function Signed-off-by: Michael Adam Reviewed-by: Jeremy Allison --- docs-xml/smbdotconf/browse/preferredmaster.xml | 2 +- lib/param/loadparm.h | 1 - source3/param/loadparm.c | 6 ++++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml index 0392564caf7..15ebd2484c0 100644 --- a/docs-xml/smbdotconf/browse/preferredmaster.xml +++ b/docs-xml/smbdotconf/browse/preferredmaster.xml @@ -2,7 +2,7 @@ context="G" type="enum" enumlist="enum_bool_auto" - generated_function="0" + function="_preferred_master" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> prefered master diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h index c49d1314f95..4ed332c7672 100644 --- a/lib/param/loadparm.h +++ b/lib/param/loadparm.h @@ -252,7 +252,6 @@ enum case_handling {CASE_LOWER,CASE_UPPER}; int iminreceivefile; \ char *szPrintcapname; \ int CupsEncrypt; \ - int _preferred_master; \ char *szIdmapUID; \ char *szIdmapGID; \ char *szIdmapBackend; \ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 8c724bc727d..ad2305acdba 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -4101,10 +4101,12 @@ static bool lp_domain_master_true_or_auto(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 (bool)Globals._preferred_master; + return (bool)preferred_master; } /******************************************************************* -- 2.34.1