summaryrefslogtreecommitdiff
path: root/source4/torture/smbtorture.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-03 17:41:50 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:47:34 +0100
commitecea5ce24553989103d4a06296b24f4d29f30a36 (patch)
tree806e6d582a799f24061dc5ca9df2ac36c26ad4f6 /source4/torture/smbtorture.c
parentab5bbd26029e8ae62256c454daee14852b940a6a (diff)
downloadsamba-ecea5ce24553989103d4a06296b24f4d29f30a36.tar.gz
samba-ecea5ce24553989103d4a06296b24f4d29f30a36.tar.bz2
samba-ecea5ce24553989103d4a06296b24f4d29f30a36.zip
r26260: Store loadparm context in gensec context.
(This used to be commit b9e3a4862e267be39d603fed8207a237c3d72081)
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 75260e1277..ef6484ebc9 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;
- init_iconv();
+ close_iconv();
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;
- init_iconv();
+ close_iconv();
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;
- init_iconv();
+ close_iconv();
torture->active_testname = talloc_strdup(torture, prefix);
ret &= torture_run_tcase(torture, t);
talloc_free(torture->active_testname);