s3:loadparm: add wrapper lp_load_globals_no_reinit()

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f64c4d15e83e206f33bd53e60f951d9a3721439b..a3e5fb6b4a406cd03e2e13f0417bc2e9c7887d81 100644 (file)
--- 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 038032cf48707b8b1458488bb218bbfd4360a715..135f6f5451085c92f8b580542ca535cf5bba66e5 100644 (file)
--- 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,