param: turn 'preferred master' into a generated function

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/smbdotconf/browse/preferredmaster.xml b/docs-xml/smbdotconf/browse/preferredmaster.xml
index 0392564caf7ea8779fcc890a326ec81a881ffb26..15ebd2484c098b269c577aba43e0c2084c627a7f 100644 (file)
--- 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">
 <synonym>prefered master</synonym>
  <description>

diff --git a/lib/param/loadparm.h b/lib/param/loadparm.h
index c49d1314f95f1b4251c2b72fe6e35b250b610100..4ed332c7672952503d7fac43b94b20c25a8e80b5 100644 (file)
--- 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 8c724bc727de729b1be5da685a95f086cbddb689..ad2305acdba8e50a08d2989c933c23ee7ee21487 100644 (file)
--- 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;
 }
 
 /*******************************************************************