summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-11 09:19:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:21 -0500
commite96b2df638b12b2e85a311993c328d5251919279 (patch)
tree283bffdfe306e895994ee132c13733f4e1a0504f /source4/lib
parent208bc043624fa1583fa4ed1952a13f1743a4e2ff (diff)
downloadsamba-e96b2df638b12b2e85a311993c328d5251919279.tar.gz
samba-e96b2df638b12b2e85a311993c328d5251919279.tar.bz2
samba-e96b2df638b12b2e85a311993c328d5251919279.zip
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)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/charset/iconv.c3
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);