diff options
| author | Michael Adam <obnox@samba.org> | 2008-05-10 00:13:11 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2008-05-10 00:15:00 +0200 |
| commit | 1e161b8c81631254c077f96d33641158ae4bae80 (patch) | |
| tree | 412f27f0d1b4381b196d7b48d1e22d12fd3532c7 | |
| parent | 48b8bacfe4b0cc7369d7e7d9387a010ffb6fee2a (diff) | |
| download | samba-1e161b8c81631254c077f96d33641158ae4bae80.tar.gz samba-1e161b8c81631254c077f96d33641158ae4bae80.tar.bz2 samba-1e161b8c81631254c077f96d33641158ae4bae80.zip | |
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)
| -rw-r--r-- | source3/param/loadparm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 09049db9ff..b539684457 100644 --- 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); } /*************************************************************************** |