From: Michael Adam <obnox@samba.org>
Date: Fri, 9 May 2008 22:13:11 +0000 (+0200)
Subject: loadparm: Fix activation of registry globals in lp_load_*.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8bab6d651f1cd0efe5aa1e7808b3f043602a3dfa;p=thirdparty%2Fsamba.git

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
---

diff --git a/source/param/loadparm.c b/source/param/loadparm.c
index 09049db9ffa..b5396844573 100644
--- a/source/param/loadparm.c
+++ b/source/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);
 }
 
 /***************************************************************************