summaryrefslogtreecommitdiff
path: root/source4/torture/basic
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-21 15:21:45 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-21 15:21:45 +0100
commitd9f8232c34a695df04a5240e270dd7ffc3101c0e (patch)
tree292590769a70bed4722ed677df74569e71f5b355 /source4/torture/basic
parent921b17648456027b6b46a582aa1d13024a5e9a90 (diff)
downloadsamba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.tar.gz
samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.tar.bz2
samba-d9f8232c34a695df04a5240e270dd7ffc3101c0e.zip
Remove more uses of global_loadparm.
(This used to be commit 230355d2e6e27918dff40823eb238904c7a1870e)
Diffstat (limited to 'source4/torture/basic')
-rw-r--r--source4/torture/basic/utable.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index 112cf323a1..2b222d7c6e 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -98,7 +98,7 @@ bool torture_utable(struct torture_context *tctx,
}
-static char *form_name(int c)
+static char *form_name(struct smb_iconv_convenience *iconv_convenience, int c)
{
static fstring fname;
uint8_t c2[4];
@@ -109,7 +109,7 @@ static char *form_name(int c)
p = fname+strlen(fname);
SSVAL(c2, 0, c);
- len = convert_string(lp_iconv_convenience(global_loadparm), CH_UTF16, CH_UNIX,
+ len = convert_string(iconv_convenience, CH_UTF16, CH_UNIX,
c2, 2,
p, sizeof(fname)-strlen(fname));
p[len] = 0;
@@ -139,7 +139,7 @@ bool torture_casetable(struct torture_context *tctx,
torture_comment(tctx, "%04x (%c)\n", c, isprint(c)?c:'.');
- fname = form_name(c);
+ fname = form_name(lp_iconv_convenience(tctx->lp_ctx), c);
fnum = smbcli_nt_create_full(cli->tree, fname, 0,
#if 0
SEC_RIGHT_MAXIMUM_ALLOWED,