diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:07 +0100 |
| commit | 5e00673a4063c9a51580a36ba1f824bd8ea0de66 (patch) | |
| tree | 6b5547cc28b05a97062df284d04db41135bf573d /source4/torture/rpc | |
| parent | e8f46760e0134c45cd2b6b27aef60622c4bf58fa (diff) | |
| download | samba-5e00673a4063c9a51580a36ba1f824bd8ea0de66.tar.gz samba-5e00673a4063c9a51580a36ba1f824bd8ea0de66.tar.bz2 samba-5e00673a4063c9a51580a36ba1f824bd8ea0de66.zip | |
r26438: Store iconv convenience in tdr push contexts.
(This used to be commit dffef3162778aebe2f8d77e2da60b22adb7d60ef)
Diffstat (limited to 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/spoolss_win.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/wkssvc.c | 2 |
2 files changed, 2 insertions, 2 deletions
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); |