From d891c0c74a03d797aed1c5ac0329fd9d1d78da63 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 13 Dec 2007 22:46:09 +0100
Subject: r26429: Avoid use of global_smb_iconv_convenience. (This used to be
 commit d37136b7abfbba75ef2e5ab855eb3382b9648b8c)

---
 source4/torture/rpc/samba3rpc.c   | 2 +-
 source4/torture/rpc/samlogon.c    | 4 ++--
 source4/torture/rpc/spoolss_win.c | 2 +-
 source4/torture/rpc/wkssvc.c      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/torture/rpc')

diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 496453e181..a63772e964 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -2314,7 +2314,7 @@ static NTSTATUS get_servername(TALLOC_CTX *mem_ctx, struct smbcli_tree *tree,
 	memcpy(servername, r.out.info.info0.name, 16);
 	servername[16] = '\0';
 
-	if (pull_ascii_talloc(mem_ctx, global_smb_iconv_convenience, 
+	if (pull_ascii_talloc(mem_ctx, lp_iconv_convenience(global_loadparm), 
 			      name, servername) < 0) {
 		return NT_STATUS_NO_MEMORY;
 	}
diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index b60cef7d53..7fd5199908 100644
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -1158,7 +1158,7 @@ static bool test_plaintext(struct samlogon_state *samlogon_state, enum ntlm_brea
 	ZERO_STRUCT(user_session_key);
 	
 	if ((push_ucs2_talloc(samlogon_state->mem_ctx, 
-			      global_smb_iconv_convenience, 
+			      lp_iconv_convenience(global_loadparm), 
 			      &unicodepw, samlogon_state->password)) == -1) {
 		DEBUG(0, ("push_ucs2_allocate failed!\n"));
 		exit(1);
@@ -1169,7 +1169,7 @@ static bool test_plaintext(struct samlogon_state *samlogon_state, enum ntlm_brea
 	password = strupper_talloc(samlogon_state->mem_ctx, samlogon_state->password);
 
 	if ((convert_string_talloc(samlogon_state->mem_ctx, 
-				   global_smb_iconv_convenience,
+				   lp_iconv_convenience(global_loadparm),
 				   CH_UNIX, CH_DOS, 
 				   password, strlen(password)+1, 
 				   (void**)&dospw)) == -1) {
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 8e22750d0c..9192d98c73 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, global_smb_iconv_convenience, CH_UTF16,
+	convert_string_talloc(ctx, lp_iconv_convenience(global_loadparm), 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 ddec59a15d..98e811468d 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, global_smb_iconv_convenience, 
+	size = push_ucs2_talloc(tctx, lp_iconv_convenience(global_loadparm), 
 				(void **)&msg, message);
 
 	r.in.server_name = dcerpc_server_name(p);
-- 
cgit