sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

s3:param: rename arg initialize_globals->reinit_globals in lp_load_ex()

Browse Source 
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
This commit is contained in:
Michael Adam 2014-09-20 04:48:11 +02:00 committed by Ira Cooper
parent 8b7acbbc80
commit 3a8952e3e7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/param/loadparm.c
View File

@ -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*/
}