[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2379-gc1f300c

[Michael Adam]

The branch, v3-3-test has been updated
       via  c1f300c76e882f2d108596aa3dbc211d545c665a (commit)
      from  e54c71954ae484fe4a4e195db33440490e78e256 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit c1f300c76e882f2d108596aa3dbc211d545c665a
Author: Michael Adam <obnox at samba.org>
Date:   Sat May 10 00:13:11 2008 +0200

    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

-----------------------------------------------------------------------

Summary of changes:
 source/param/loadparm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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


-- 
Samba Shared Repository