From 389208658972b6b19f15167dc8c2dd419e404a2e Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Mon, 17 Feb 2014 16:33:55 +1300 Subject: param: attempt to consolidate handle_debug_level between the two loadparms Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-on: https://gerrit.samba.org/102 Reviewed-by: Andreas Schneider Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'lib/param/loadparm.c') diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 97a06a0efd..b47a2c0486 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -102,8 +102,6 @@ static bool handle_realm(struct loadparm_context *lp_ctx, int unused, const char *pszParmValue, char **ptr); static bool handle_copy(struct loadparm_context *lp_ctx, int unused, const char *pszParmValue, char **ptr); -static bool handle_debug_list(struct loadparm_context *lp_ctx, int unused, - const char *pszParmValue, char **ptr); static bool handle_logfile(struct loadparm_context *lp_ctx, int unused, const char *pszParmValue, char **ptr); @@ -1136,15 +1134,16 @@ static bool handle_copy(struct loadparm_context *lp_ctx, int unused, return bRetval; } -static bool handle_debug_list(struct loadparm_context *lp_ctx, int unused, +bool handle_debug_list(struct loadparm_context *lp_ctx, int unused, const char *pszParmValue, char **ptr) { - - lpcfg_string_set(lp_ctx, ptr, pszParmValue); - if (lp_ctx->global) { - return debug_parse_levels(pszParmValue); + if (lp_ctx->s3_fns != NULL) { + lp_ctx->s3_fns->lp_string_set(ptr, pszParmValue); + } else { + lpcfg_string_set(lp_ctx, ptr, pszParmValue); } - return true; + + return debug_parse_levels(pszParmValue); } static bool handle_logfile(struct loadparm_context *lp_ctx, int unused, -- cgit