diff options
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 6 | ||||
| -rw-r--r-- | source4/param/util.c | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 3d87d6fb129..31157b28333 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -2776,11 +2776,7 @@ int lpcfg_maxprintjobs(struct loadparm_service *service, struct loadparm_service struct smb_iconv_convenience *lpcfg_iconv_convenience(struct loadparm_context *lp_ctx) { if (lp_ctx == NULL) { - static struct smb_iconv_convenience *fallback_ic = NULL; - if (fallback_ic == NULL) - fallback_ic = smb_iconv_convenience_reinit(talloc_autofree_context(), - "CP850", "UTF8", true, NULL); - return fallback_ic; + return get_iconv_convenience(); } return lp_ctx->iconv_convenience; } diff --git a/source4/param/util.c b/source4/param/util.c index fd12bb1ecaf..c6dca6076e4 100644 --- a/source4/param/util.c +++ b/source4/param/util.c @@ -304,6 +304,7 @@ struct smb_iconv_convenience *smb_iconv_convenience_reinit_lp(TALLOC_CTX *mem_ct { return smb_iconv_convenience_reinit(mem_ctx, lpcfg_dos_charset(lp_ctx), lpcfg_unix_charset(lp_ctx), + lpcfg_display_charset(lp_ctx), lpcfg_parm_bool(lp_ctx, NULL, "iconv", "native", true), old_ic); } |