summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-08-20 17:51:48 +1000
committerMichael Adam <obnox@samba.org>2010-08-22 22:54:59 +0200
commitd8734c3c03ca3cd501b064c5f3b4684e62e751d6 (patch)
tree2fb6f6ffe1f70372231c593bf2a868e8439ed597
parent8531921e3d4bba30ed6d10bf671b0b70d2f4f3f7 (diff)
downloadsamba-d8734c3c03ca3cd501b064c5f3b4684e62e751d6.tar.gz
samba-d8734c3c03ca3cd501b064c5f3b4684e62e751d6.tar.bz2
samba-d8734c3c03ca3cd501b064c5f3b4684e62e751d6.zip
s3:param Clarify parameter name on init_globals()
This parameter is used with the registry backend to cause the globals table to be re-initialised. Andrew Bartlett Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/param/loadparm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 340031b45f..225f6c927b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4947,14 +4947,14 @@ static void free_global_parameters(void)
Initialise the global parameter structure.
***************************************************************************/
-static void init_globals(bool first_time_only)
+static void init_globals(bool reinit_globals)
{
static bool done_init = False;
char *s = NULL;
int i;
/* If requested to initialize only once and we've already done it... */
- if (first_time_only && done_init) {
+ if (!reinit_globals && done_init) {
/* ... then we have nothing more to do */
return;
}
@@ -9181,7 +9181,7 @@ static bool lp_load_ex(const char *pszFname,
bGlobalOnly = global_only;
bAllowIncludeRegistry = allow_include_registry;
- init_globals(! initialize_globals);
+ init_globals(initialize_globals);
debug_init();
free_file_list();
@@ -9229,7 +9229,7 @@ static bool lp_load_ex(const char *pszFname,
/* start over */
DEBUG(1, ("lp_load_ex: changing to config backend "
"registry\n"));
- init_globals(false);
+ init_globals(true);
lp_kill_all_services();
return lp_load_ex(pszFname, global_only, save_defaults,
add_ipc, initialize_globals,