From e96b2df638b12b2e85a311993c328d5251919279 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 11 Sep 2006 09:19:58 +0000 Subject: r18376: added iconv:native=false option to turn off native iconv. Needed under valgrind as native iconv is so full of overflows (This used to be commit d1de0202efc6e6ca4bbc1997f3e493da18cd35f4) --- source4/lib/charset/iconv.c | 3 +++ 1 file changed, 3 insertions(+) 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); -- cgit