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/basic | |
| 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/basic')
| -rw-r--r-- | source4/torture/basic/charset.c | 2 | ||||
| -rw-r--r-- | source4/torture/basic/utable.c | 2 |
2 files changed, 2 insertions, 2 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; |