summaryrefslogtreecommitdiff
path: root/source4/param/loadparm.c
diff options
context:
space:
mode:
Diffstat (limited to 'source4/param/loadparm.c')
-rw-r--r--source4/param/loadparm.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 064f67ba82..d732a09f2f 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2586,8 +2586,11 @@ int lp_maxprintjobs(struct loadparm_service *service)
struct smb_iconv_convenience *lp_iconv_convenience(struct loadparm_context *lp_ctx)
{
if (lp_ctx == NULL) {
- return smb_iconv_convenience_init(talloc_autofree_context(),
+ static struct smb_iconv_convenience *fallback_ic = NULL;
+ if (fallback_ic == NULL)
+ fallback_ic = smb_iconv_convenience_init(talloc_autofree_context(),
"CP850", "UTF8", true);
+ return fallback_ic;
}
return lp_ctx->iconv_convenience;
}