diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-17 16:33:55 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:14 +0200 |
| commit | 389208658972b6b19f15167dc8c2dd419e404a2e (patch) | |
| tree | af58b185962ab63126bf63ce6bb079681f0d8212 /lib/param/loadparm.c | |
| parent | 84b98a2ce58a5fe88913e34ae020775cfbba8f7f (diff) | |
| download | samba-389208658972b6b19f15167dc8c2dd419e404a2e.tar.gz samba-389208658972b6b19f15167dc8c2dd419e404a2e.tar.xz samba-389208658972b6b19f15167dc8c2dd419e404a2e.zip | |
param: attempt to consolidate handle_debug_level between the two loadparms
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-on: https://gerrit.samba.org/102
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib/param/loadparm.c')
| -rw-r--r-- | lib/param/loadparm.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 97a06a0efd0..b47a2c04866 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, |