From 3a8952e3e7e69ae5d8616da333b1977ee559f4b1 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Sat, 20 Sep 2014 04:48:11 +0200 Subject: [PATCH] s3:param: rename arg initialize_globals->reinit_globals in lp_load_ex() Signed-off-by: Michael Adam Reviewed-by: Ira Cooper --- source3/param/loadparm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 22f5cfd33c2..59ff4427905 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3652,7 +3652,7 @@ static bool lp_load_ex(const char *pszFname, bool global_only, bool save_defaults, bool add_ipc, - bool initialize_globals, + bool reinit_globals, bool allow_include_registry, bool load_all_shares) { @@ -3671,7 +3671,7 @@ static bool lp_load_ex(const char *pszFname, lp_ctx = setup_lp_context(talloc_tos()); - init_globals(lp_ctx, initialize_globals); + init_globals(lp_ctx, reinit_globals); free_file_list(); @@ -3680,7 +3680,7 @@ static bool lp_load_ex(const char *pszFname, lp_save_defaults(); } - if (!initialize_globals) { + if (!reinit_globals) { free_param_opts(&Globals.param_opt); apply_lp_set_cmdline(); } @@ -3731,7 +3731,7 @@ static bool lp_load_ex(const char *pszFname, lp_kill_all_services(); ok = lp_load_ex(pszFname, global_only, save_defaults, - add_ipc, initialize_globals, + add_ipc, reinit_globals, allow_include_registry, load_all_shares); TALLOC_FREE(frame); @@ -3824,7 +3824,7 @@ bool lp_load_initial_only(const char *pszFname) true, /* global only */ true, /* save_defaults */ false, /* add_ipc */ - true, /* initialize_globals */ + true, /* reinit_globals */ false, /* allow_include_registry */ false); /* load_all_shares*/ }