param: use lpcfg_dump_globals in s3 loadparm

Change-Id: I7f7f5238a47e0c3634757b74f3f852ce36988614
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 6f8eedb660f4ad99442c8a9ce77eccf2499fc5b5..ff2ba6ab5670b4978ce5511def0ff97ad16e2471 100644 (file)
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -2030,7 +2030,7 @@ bool is_default(void *base_structure, int i)
  *Display the contents of the global structure.
  */
 
-static void lpcfg_dump_globals(struct loadparm_context *lp_ctx, FILE *f,
+void lpcfg_dump_globals(struct loadparm_context *lp_ctx, FILE *f,
                         bool show_defaults)
 {
        int i;

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 547acf8e3204ac3096982f317a3ffc356fa7fd4e..5c1c4fdf35b7350bb1075fd93f9e09f8b895ea49 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4064,11 +4064,22 @@ Display the contents of the services array in human-readable form.
 void lp_dump(FILE *f, bool show_defaults, int maxtoprint)
 {
        int iService;
+       struct loadparm_context *lp_ctx;
 
        if (show_defaults)
                defaults_saved = false;
 
-       dump_globals(f, defaults_saved);
+       lp_ctx = loadparm_init_s3(talloc_tos(),
+                                 loadparm_s3_helpers());
+       if (lp_ctx == NULL) {
+               DEBUG(0, ("loadparm_init_s3 failed\n"));
+               return;
+       }
+
+       lp_ctx->sDefault = &sDefault;
+       lp_ctx->services = ServicePtrs;
+
+       lpcfg_dump_globals(lp_ctx, f, !defaults_saved);
 
        lpcfg_dump_a_service(&sDefault, &sDefault, f, flags_list, show_defaults);