r26260: Store loadparm context in gensec context.

(This used to be commit b9e3a4862e267be39d603fed8207a237c3d72081)

3 files changed, 6 insertions, 6 deletions

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index 23269a0160..f2cc0a9182 100644
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -32,7 +32,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 	TALLOC_CTX *mem_ctx = tctx;
 
 	torture_assert_ntstatus_ok(tctx, 
-		gensec_client_start(mem_ctx, &gensec_security, NULL),
+		gensec_client_start(mem_ctx, &gensec_security, NULL, tctx->lp_ctx),
 		"gensec client start");
 
 	gensec_set_credentials(gensec_security, cmdline_credentials);
@@ -86,7 +86,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx)
 	talloc_free(gensec_security);
 
 	torture_assert_ntstatus_ok(tctx, 
-		gensec_client_start(mem_ctx, &gensec_security, NULL),
+		gensec_client_start(mem_ctx, &gensec_security, NULL, tctx->lp_ctx),
 		"Failed to start GENSEC for NTLMSSP");
 
 	gensec_set_credentials(gensec_security, cmdline_credentials);
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index d9ac271119..9f47a6839f 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -309,7 +309,7 @@ static void usage(void)
 
 	seed = time(NULL);
 
-	init_iconv();
+	close_iconv();
 
 	while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) {
 		switch (opt) {
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);