svn commit: samba r18376 - in branches/SAMBA_4_0/source/lib/charset: .

[tridge at samba.org]

Author: tridge
Date: 2006-09-11 09:19:58 +0000 (Mon, 11 Sep 2006)
New Revision: 18376

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18376

Log:

added iconv:native=false option to turn off native iconv. Needed under
valgrind as native iconv is so full of overflows

Modified:
   branches/SAMBA_4_0/source/lib/charset/iconv.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/charset/iconv.c
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/iconv.c	2006-09-11 09:04:51 UTC (rev 18375)
+++ branches/SAMBA_4_0/source/lib/charset/iconv.c	2006-09-11 09:19:58 UTC (rev 18376)
@@ -200,6 +200,9 @@
 	}
 
 #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);