From 60a1046c5c5783799bd64fe18e03534670f83d82 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 29 Sep 2007 18:00:19 +0000 Subject: r25430: Add the loadparm context to all parametric options. (This used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58) --- source4/lib/charset/iconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/charset/iconv.c') diff --git a/source4/lib/charset/iconv.c b/source4/lib/charset/iconv.c index 1c571f8961..9b035cd1db 100644 --- a/source4/lib/charset/iconv.c +++ b/source4/lib/charset/iconv.c @@ -199,7 +199,7 @@ smb_iconv_t smb_iconv_open(const char *tocode, const char *fromcode) } #ifdef HAVE_NATIVE_ICONV - if ((!from || !to) && !lp_parm_bool(NULL, "iconv", "native", true)) { + if ((!from || !to) && !lp_parm_bool(global_loadparm, NULL, "iconv", "native", true)) { goto failed; } if (!from) { -- cgit