diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 17:16:40 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:27 +0100 |
| commit | b440ed3df31b11d520c6d744cf53c54165f61b7a (patch) | |
| tree | b50bb6ee0a73020a6a8e9a70753415da1d503990 /source4/lib/charset/iconv.c | |
| parent | 548c3e53574da71e1afc1ec31252478a1a2c303a (diff) | |
| download | samba-b440ed3df31b11d520c6d744cf53c54165f61b7a.tar.gz samba-b440ed3df31b11d520c6d744cf53c54165f61b7a.tar.bz2 samba-b440ed3df31b11d520c6d744cf53c54165f61b7a.zip | |
r26315: Avoid using lp_ functions in libcharset.
(This used to be commit db6dd425e3526c04e96d778a736dbb5cf14ddc56)
Diffstat (limited to 'source4/lib/charset/iconv.c')
| -rw-r--r-- | source4/lib/charset/iconv.c | 5 |
1 files changed, 3 insertions, 2 deletions
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) { |