From 61013deff80dbe3a3dfaa7b5060609500f1f63fa Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 24 Oct 2008 14:45:31 +0200
Subject: Remove dependency of charset code on loadparm.

---
 lib/util/charset/util_unistr.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'lib/util/charset/util_unistr.c')

diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index 91d0be109a..a40b4298a4 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -20,11 +20,14 @@
 
 #include "includes.h"
 #include "system/locale.h"
-#include "param/param.h"
+
+struct smb_iconv_convenience *global_iconv_convenience = NULL;
 
 static inline struct smb_iconv_convenience *get_iconv_convenience(void)
 {
-	return lp_iconv_convenience(global_loadparm);
+	if (global_iconv_convenience == NULL)
+		global_iconv_convenience = smb_iconv_convenience_init(talloc_autofree_context(), "ASCII", "UTF-8", true);
+	return global_iconv_convenience;
 }
 
 /**
-- 
cgit