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>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 21fa662141bd69addc6f2ab8cbdba7081290c69c..3b5c4df35df7d2dc73ff6229f4751e2c8ce68aeb 100644 (file)
--- 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);