diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2014-02-17 16:38:59 +1300 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2014-05-07 19:49:14 +0200 |
| commit | a39d56933660e72742d9b438ae9c6b4c513c1449 (patch) | |
| tree | 39f481db9ee10583baf21d6d78e0f51d88bae188 /lib/param/loadparm.c | |
| parent | e06acfadd03e7cee8c7cbe0fe9660a6070f8bfb0 (diff) | |
| download | samba-a39d56933660e72742d9b438ae9c6b4c513c1449.tar.gz samba-a39d56933660e72742d9b438ae9c6b4c513c1449.tar.xz samba-a39d56933660e72742d9b438ae9c6b4c513c1449.zip | |
param: attempt to consolidate handle_logfile 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/104
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 | 13 |
1 files changed, 7 insertions, 6 deletions
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; } |