diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 18:47:35 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:39 +0100 |
commit | 1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd (patch) | |
tree | 3e8c16ffd419fbd950fcef1569f0bc82709f5831 /source4/lib/charset/tests | |
parent | cb7c72a0ef9a8e6d145ead6286e54ec50ddf3988 (diff) | |
download | samba-1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd.tar.gz samba-1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd.tar.bz2 samba-1fbdd6ef1dfb8704de0524fc6f5c33e1418858cd.zip |
r26264: pass name resolve order explicitly, use torture context for settings in dssync tests.
(This used to be commit c7eae1c7842f9ff8b70cce9e5d6f3ebbbe78e83b)
Diffstat (limited to 'source4/lib/charset/tests')
-rw-r--r-- | source4/lib/charset/tests/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/charset/tests/iconv.c b/source4/lib/charset/tests/iconv.c index 259769d60f..9080dda40e 100644 --- a/source4/lib/charset/tests/iconv.c +++ b/source4/lib/charset/tests/iconv.c @@ -34,7 +34,7 @@ static bool iconv_untestable(struct torture_context *tctx) { iconv_t cd; - if (!lp_parm_bool(global_loadparm, NULL, "iconv", "native", true)) + if (!lp_parm_bool(tctx->lp_ctx, NULL, "iconv", "native", true)) torture_skip(tctx, "system iconv disabled - skipping test"); cd = iconv_open("UTF-16LE", "UCS-4LE"); |