summaryrefslogtreecommitdiff
path: root/source4/torture/masktest.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 13:13:27 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 13:13:27 +0200
commit8b06312f7eeff5ea8625677478792888774bd2be (patch)
treecd1d662f3e7e43a0c5ed667d396592f6aa6c941a /source4/torture/masktest.c
parent5d146d0178d7da8d8f14f340dacb5b01fd03fab8 (diff)
downloadsamba-8b06312f7eeff5ea8625677478792888774bd2be.tar.gz
samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.bz2
samba-8b06312f7eeff5ea8625677478792888774bd2be.zip
Eliminate another instance of global_loadparm.
Diffstat (limited to 'source4/torture/masktest.c')
-rw-r--r--source4/torture/masktest.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index 6e9ae89336..14d597666e 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -77,7 +77,8 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
TALLOC_CTX *mem_ctx,
char *share, const char **ports,
struct smbcli_options *options,
- struct smbcli_session_options *session_options)
+ struct smbcli_session_options *session_options,
+ struct smb_iconv_convenience *iconv_convenience)
{
struct smbcli_state *c;
char *server;
@@ -96,7 +97,8 @@ static struct smbcli_state *connect_one(struct resolve_context *resolve_ctx,
ports,
share, NULL,
cmdline_credentials, resolve_ctx, ev,
- options, session_options);
+ options, session_options,
+ iconv_convenience);
if (!NT_STATUS_IS_OK(status)) {
return NULL;
@@ -366,7 +368,8 @@ static void usage(poptContext pc)
lp_smbcli_session_options(lp_ctx, &session_options);
cli = connect_one(lp_resolve_context(lp_ctx), ev, mem_ctx, share,
- lp_smb_ports(lp_ctx), &options, &session_options);
+ lp_smb_ports(lp_ctx), &options, &session_options,
+ lp_iconv_convenience(lp_ctx));
if (!cli) {
DEBUG(0,("Failed to connect to %s\n", share));
exit(1);