r26438: Store iconv convenience in tdr push contexts.

(This used to be commit dffef3162778aebe2f8d77e2da60b22adb7d60ef)

5 files changed, 5 insertions, 5 deletions

diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 7dfbdebe7f..a5d534b92b 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -56,7 +56,7 @@ static NTSTATUS unicode_open(struct torture_context *tctx,
 	}
 	SSVAL(ucs_name, i*2, 0);
 
-	i = convert_string_talloc(ucs_name, lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname);
+	i = convert_string_talloc(ucs_name, lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, ucs_name, (1+u_name_len)*2, (void **)&fname);
 	if (i == -1) {
 		torture_comment(tctx, "Failed to convert UCS2 Name into unix - convert_string_talloc() failure\n");
 		talloc_free(ucs_name);
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index 51b7b39309..112cf323a1 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -50,7 +50,7 @@ bool torture_utable(struct torture_context *tctx,
 		SSVAL(c2, 0, c);
 		fstrcpy(fname, "\\utable\\x");
 		p = fname+strlen(fname);
-		len = convert_string(lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX, 
+		len = convert_string(lp_iconv_convenience(tctx->lp_ctx), CH_UTF16, CH_UNIX, 
 				     c2, 2, 
 				     p, sizeof(fname)-strlen(fname));
 		p[len] = 0;
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 5294e00df9..9deb53086a 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -183,7 +183,7 @@ static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
 		return NT_STATUS_INVALID_PARAMETER;
 
 	*dest = talloc_zero_array(mem_ctx, char, len+1);
-	pull_string(lp_iconv_convenience(global_loadparm), *dest, p, len+1, len, STR_ASCII);
+	pull_string(ndr->iconv_convenience, *dest, p, len+1, len, STR_ASCII);
 
 	return NT_STATUS_OK;
 }
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 9192d98c73..9e2921d406 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -355,7 +355,7 @@ static bool test_EnumPrinterKey(struct torture_context *tctx,
 
 	torture_assert_werr_ok(tctx, epk.out.result, "EnumPrinterKey failed");
 
-	convert_string_talloc(ctx, lp_iconv_convenience(global_loadparm), CH_UTF16,
+	convert_string_talloc(ctx, lp_iconv_convenience(tctx->lp_ctx), CH_UTF16,
 			CH_UNIX, epk.out.key_buffer, epk.out.needed,
 			(void**)&ctx->printer_keys);
 
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 98e811468d..b212a44b33 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -966,7 +966,7 @@ static bool test_NetrMessageBufferSend(struct torture_context *tctx,
 	size_t size;
 	uint8_t *msg;
 
-	size = push_ucs2_talloc(tctx, lp_iconv_convenience(global_loadparm), 
+	size = push_ucs2_talloc(tctx, lp_iconv_convenience(tctx->lp_ctx), 
 				(void **)&msg, message);
 
 	r.in.server_name = dcerpc_server_name(p);