summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-07-26 12:21:00 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-08 15:09:54 +0200
commit0ba52e97bf0f7ec6893fab15b69c24610c43a36d (patch)
treec4e746f02c588066d9b103712d4e110f03dc2036
parente16f004dc0b04c45cd5b16de47968094575d2a38 (diff)
downloadsamba-0ba52e97bf0f7ec6893fab15b69c24610c43a36d.tar.gz
samba-0ba52e97bf0f7ec6893fab15b69c24610c43a36d.tar.bz2
samba-0ba52e97bf0f7ec6893fab15b69c24610c43a36d.zip
s3-loadparm: fixed re-application of cmdline parametric options
this ensures that cmdline parametric options are re-applied when we reload smb.conf Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/param/loadparm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 21fa662141..3b5c4df35d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -8989,7 +8989,10 @@ static bool lp_load_ex(const char *pszFname,
lp_save_defaults();
}
- free_param_opts(&Globals.param_opt);
+ if (!initialize_globals) {
+ free_param_opts(&Globals.param_opt);
+ apply_lp_set_cmdline();
+ }
lp_do_parameter(-1, "idmap config * : backend", Globals.szIdmapBackend);