From 0ba52e97bf0f7ec6893fab15b69c24610c43a36d Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 26 Jul 2011 12:21:00 +1000 Subject: 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 --- source3/param/loadparm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/param') 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); -- cgit