From b440ed3df31b11d520c6d744cf53c54165f61b7a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 6 Dec 2007 17:16:40 +0100 Subject: r26315: Avoid using lp_ functions in libcharset. (This used to be commit db6dd425e3526c04e96d778a736dbb5cf14ddc56) --- source4/lib/charset/iconv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/lib/charset/iconv.c') diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index 9b035cd1db..937b3ec8b5 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -157,7 +157,8 @@ static bool is_utf16(const char *name) /* simple iconv_open() wrapper */ -smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) +smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode, + bool native_iconv) { smb_iconv_t ret; const struct charset_functions *from=NULL, *to=NULL; @@ -199,7 +200,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) } #ifdef HAVE_NATIVE_ICONV - if ((!from || !to) && !lp_parm_bool(global_loadparm, NULL, "iconv", "native", true)) { + if ((!from || !to) && !native_iconv) { goto failed; } if (!from) { -- cgit