diff options
| author | Michael Adam <obnox@samba.org> | 2015-04-21 14:48:42 +0200 |
|---|---|---|
| committer | Ira Cooper <ira@samba.org> | 2015-04-22 13:57:30 +0200 |
| commit | 0e0d77519c27038b30fec92d542198e97be767d9 (patch) | |
| tree | 586b5de3ff9ce4ac738722ba3d8f72449ae013c7 /source3/param | |
| parent | 55bf0d0a2b1f3c9bc43dcf7ab19380501b251f0a (diff) | |
| download | samba-0e0d77519c27038b30fec92d542198e97be767d9.tar.gz | |
s3:param: remove arg initialize_globals from lp_load_with_registry_shares()
This is only ever called in client context, and only called once.
So there is no point at all in requesting reinit_globals.
Set it to false.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 5 | ||||
| -rw-r--r-- | source3/param/test_lp_load.c | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index ca773a7032a..8e2a13b4517 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -3905,14 +3905,13 @@ bool lp_load_client_no_reinit(const char *file_name) } bool lp_load_with_registry_shares(const char *pszFname, - bool save_defaults, - bool initialize_globals) + bool save_defaults) { return lp_load_ex(pszFname, false, /* global_only */ save_defaults, false, /* add_ipc */ - initialize_globals, + false, /* reinit_globals */ true, /* allow_include_registry */ true); /* load_all_shares*/ } diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c index bd373b9e354..3bb0b892fdb 100644 --- a/source3/param/test_lp_load.c +++ b/source3/param/test_lp_load.c @@ -62,8 +62,7 @@ int main(int argc, const char **argv) for (i=0; i < count; i++) { printf("call lp_load() #%d: ", i+1); if (!lp_load_with_registry_shares(config_file, - True, /* save defaults */ - True)) /*init globals */ + True)) /* save defaults */ { printf("ERROR.\n"); ret = 1; |