Fix the circular dependency that was preventing 'domain master = auto' (the

default) from working.

Andrew Bartlett
(This used to be commit 25950dbb3272949a235bed936c7d7b1d23f15fac)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 4aaf6f20eb78c5d0ba6bfd9d00fc5846e7feb9e0..c484439837046a5a4626f2b327113942bbf61188 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3563,7 +3563,7 @@ static void set_server_role(void)
                case SEC_USER:
                        if (lp_domain_logons()) {
 
-                               if (lp_domain_master())
+                               if (Globals.bDomainMaster) /* auto or yes */ 
                                        server_role = ROLE_DOMAIN_PDC;
                                else
                                        server_role = ROLE_DOMAIN_BDC;