summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRalph Boehme <slow@samba.org>2018-07-10 08:11:31 +0200
committerKarolin Seeger <kseeger@samba.org>2018-10-09 11:29:22 +0200
commitd8a68702a75915f0e173f6e603295f13457ff391 (patch)
treec7943d07ac05db02a69868fde09a06311765f4ae /source3
parent4aace8194964e08aa19a6c45571dc2b3afb7986e (diff)
downloadsamba-d8a68702a75915f0e173f6e603295f13457ff391.tar.gz
s3:loadparm: reinit_globals in lp_load_with_registry_shares()
This was set to false in 0e0d77519c27038b30fec92d542198e97be767d9 based on the assumption that callers would have no need to call lp_load_initial_only() with a later call to lp_load_something(). This is not quite correct, since for accessing registry config on a cluster with include=registry, we need messaging up and running which *itself* requires loadparm to be initialized to get the statedir, lockdir asf. directories. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13465 Signed-off-by: Ralph Boehme <slow@samba.org> Reviewed-by: Christof Schmitt <cs@samba.org> (cherry picked from commit 3aca3f24d4bdacc11278388934b0b411d518d7b0)
Diffstat (limited to 'source3')
-rw-r--r--source3/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 096c23f4fb3..ff40a07f4f0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4116,7 +4116,7 @@ bool lp_load_with_registry_shares(const char *pszFname)
false, /* global_only */
true, /* save_defaults */
false, /* add_ipc */
- false, /* reinit_globals */
+ true, /* reinit_globals */
true, /* allow_include_registry */
true); /* load_all_shares*/
}