From a39d56933660e72742d9b438ae9c6b4c513c1449 Mon Sep 17 00:00:00 2001 From: Garming Sam Date: Mon, 17 Feb 2014 16:38:59 +1300 Subject: param: attempt to consolidate handle_logfile between the two loadparms Signed-off-by: Garming Sam Reviewed-by: Andrew Bartlett Reviewed-on: https://gerrit.samba.org/104 Reviewed-by: Andreas Schneider Reviewed-by: Jeremy Allison --- lib/param/loadparm.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lib/param') diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index b47a2c04866..5a6b361d9e5 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_logfile(struct loadparm_context *lp_ctx, int unused, - const char *pszParmValue, char **ptr); #include "lib/param/param_table.c" @@ -1146,13 +1144,16 @@ bool handle_debug_list(struct loadparm_context *lp_ctx, int unused, return debug_parse_levels(pszParmValue); } -static bool handle_logfile(struct loadparm_context *lp_ctx, int unused, - const char *pszParmValue, char **ptr) +bool handle_logfile(struct loadparm_context *lp_ctx, int unused, + const char *pszParmValue, char **ptr) { - debug_set_logfile(pszParmValue); - if (lp_ctx->global) { + if (lp_ctx->s3_fns != NULL) { + lp_ctx->s3_fns->lp_string_set(ptr, pszParmValue); + } else { + debug_set_logfile(pszParmValue); lpcfg_string_set(lp_ctx, ptr, pszParmValue); } + return true; } -- cgit