diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/charset/iconv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index d3aff7b24f..8a7f4b4f6b 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -200,6 +200,9 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) } #ifdef HAVE_NATIVE_ICONV + if ((!from || !to) && !lp_parm_bool(-1, "iconv", "native", True)) { + goto failed; + } if (!from) { ret->pull = sys_iconv; ret->cd_pull = iconv_open("UTF-16LE", fromcode); |