From 5676fbb3991cf20dc9686ea416ca83590f975683 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 26 Jul 2011 12:42:29 +0200 Subject: s3:loadparm: add wrapper lp_load_globals_no_reinit() --- source3/include/proto.h | 1 + source3/param/loadparm.c | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/source3/include/proto.h b/source3/include/proto.h index f64c4d15e8..a3e5fb6b4a 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1619,6 +1619,7 @@ bool lp_load(const char *pszFname, bool lp_load_initial_only(const char *pszFname); bool lp_load_global(const char *file_name); bool lp_load_client(const char *file_name); +bool lp_load_global_no_reinit(const char *file_name); bool lp_load_with_registry_shares(const char *pszFname, bool global_only, bool save_defaults, diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 038032cf48..135f6f5451 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -9142,6 +9142,22 @@ bool lp_load_client(const char *file_name) return lp_load_global(file_name); } +/** + * lp_load wrapper, loading only globals, but intended + * for subsequent calls, not reinitializing the globals + * to default values + */ +bool lp_load_global_no_reinit(const char *file_name) +{ + return lp_load_ex(file_name, + true, /* global_only */ + false, /* save_defaults */ + false, /* add_ipc */ + false, /* initialize_globals */ + true, /* allow_include_registry */ + false); /* load_all_shares*/ +} + bool lp_load_with_registry_shares(const char *pszFname, bool global_only, bool save_defaults, -- cgit