summaryrefslogtreecommitdiff
path: root/source4/torture/smbtorture.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-04 01:51:44 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:48:04 +0100
commit6901b3c64a65d9745efac13f071225d5d2949f4d (patch)
tree3080eea5818c581371ace8178aa50156ff35c29a /source4/torture/smbtorture.c
parent9ebcd7a0df117158f1817b7d3a9a21ad4e1fa97a (diff)
downloadsamba-6901b3c64a65d9745efac13f071225d5d2949f4d.tar.gz
samba-6901b3c64a65d9745efac13f071225d5d2949f4d.tar.bz2
samba-6901b3c64a65d9745efac13f071225d5d2949f4d.zip
r26278: Tallocify convenience table for iconv handles.
(This used to be commit ad64b3baa4a5383c603d17ae75c33083af4690bb)
Diffstat (limited to 'source4/torture/smbtorture.c')
-rw-r--r--source4/torture/smbtorture.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index ef6484ebc9..33e80a4b97 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -50,7 +50,7 @@ static bool run_matching(struct torture_context *torture,
for (o = torture_root->children; o; o = o->next) {
if (gen_fnmatch(expr, o->name) == 0) {
*matched = true;
- close_iconv();
+ reload_charcnv();
ret &= torture_run_suite(torture, o);
continue;
}
@@ -67,7 +67,7 @@ static bool run_matching(struct torture_context *torture,
if (gen_fnmatch(expr, name) == 0) {
*matched = true;
- close_iconv();
+ reload_charcnv();
torture->active_testname = talloc_strdup(torture, prefix);
ret &= torture_run_suite(torture, c);
free(name);
@@ -83,7 +83,7 @@ static bool run_matching(struct torture_context *torture,
asprintf(&name, "%s-%s", prefix, t->name);
if (gen_fnmatch(expr, name) == 0) {
*matched = true;
- close_iconv();
+ reload_charcnv();
torture->active_testname = talloc_strdup(torture, prefix);
ret &= torture_run_tcase(torture, t);
talloc_free(torture->active_testname);