From 26a6f05f0fe78579baec30d9f8afda923bc35ff0 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Thu, 27 Mar 2014 08:51:56 +1300 Subject: [PATCH] param: use lpcfg_dump_globals in s3 loadparm Change-Id: I7f7f5238a47e0c3634757b74f3f852ce36988614 Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-by: Michael Adam --- lib/param/loadparm.c | 2 +- source3/param/loadparm.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 6f8eedb660f..ff2ba6ab567 100644 --- 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 547acf8e320..5c1c4fdf35b 100644 --- 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); -- 2.11.4.GIT