loadparm: Fix activation of registry globals in lp_load_*.

This completes bba04a8fba6fd5cf62578733cfdabea590e8ff51:
The reverted logic has to be put into the callers
lp_load() and lp_load_initial_only() of lp_load_ex(), too.
Silly bug.

Michael
(This used to be commit c1f300c76e882f2d108596aa3dbc211d545c665a)

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 09049db9ffa0fb845a84c25f47999addc5508438..b5396844573035d4b4872d8ee6f7a17e7b674fe7 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -8783,7 +8783,7 @@ bool lp_load(const char *pszFname,
                          save_defaults,
                          add_ipc,
                          initialize_globals,
-                         false);
+                         true);
 }
 
 bool lp_load_initial_only(const char *pszFname)
@@ -8793,7 +8793,7 @@ bool lp_load_initial_only(const char *pszFname)
                          false,
                          false,
                          true,
-                         true);
+                         false);
 }
 
 /***************************************************************************