s3:param: add lp_load_no_reinit()

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Ira Cooper <ira@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index ea5fb048b19a5ea51ce42ed2636342d2efceaecd..0320f0982335fc9bc959204a958d5e45ec103b89 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1066,6 +1066,7 @@ bool lp_load_global(const char *file_name);
 bool lp_load_with_shares(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_no_reinit(const char *file_name);
 bool lp_load_client_no_reinit(const char *file_name);
 bool lp_load_with_registry_shares(const char *pszFname,
                                  bool save_defaults,

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 672155bdfde89d6b51d96676310c62be09ede8b9..b9542d8bf581f562b8bdd700a925c12b803bd0ec 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -3875,6 +3875,21 @@ bool lp_load_global_no_reinit(const char *file_name)
                       false); /* initialize_globals */
 }
 
+/**
+ * lp_load wrapper, loading globals and shares,
+ * intended for subsequent calls, i.e. not reinitializing
+ * the globals to default values.
+ */
+bool lp_load_no_reinit(const char *file_name)
+{
+       return lp_load(file_name,
+                      false,  /* global_only */
+                      false,  /* save_defaults */
+                      false,  /* add_ipc */
+                      false); /* reinit_globals */
+}
+
+
 /**
  * lp_load wrapper, especially for clients, no reinitialization
  */