diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 13:13:27 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 13:13:27 +0200 |
| commit | 8b06312f7eeff5ea8625677478792888774bd2be (patch) | |
| tree | cd1d662f3e7e43a0c5ed667d396592f6aa6c941a /source4/torture/basic | |
| parent | 5d146d0178d7da8d8f14f340dacb5b01fd03fab8 (diff) | |
| download | samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.gz samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.bz2 samba-8b06312f7eeff5ea8625677478792888774bd2be.zip | |
Eliminate another instance of global_loadparm.
Diffstat (limited to 'source4/torture/basic')
| -rw-r--r-- | source4/torture/basic/base.c | 3 | ||||
| -rw-r--r-- | source4/torture/basic/misc.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 2ab3f9ca91..f2b7b9b225 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -56,7 +56,8 @@ static struct smbcli_state *open_nbt_connection(struct torture_context *tctx) lp_smbcli_options(tctx->lp_ctx, &options); if (!smbcli_socket_connect(cli, host, lp_smb_ports(tctx->lp_ctx), tctx->ev, - lp_resolve_context(tctx->lp_ctx), &options)) { + lp_resolve_context(tctx->lp_ctx), &options, + lp_iconv_convenience(tctx->lp_ctx))) { torture_comment(tctx, "Failed to connect with %s\n", host); goto failed; } diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 3a09fa74b5..89e7169883 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -821,6 +821,7 @@ static struct composite_context *torture_connect_async( smb->in.service_type=NULL; smb->in.credentials=cmdline_credentials; smb->in.fallback_to_anonymous=false; + smb->in.iconv_convenience = lp_iconv_convenience(tctx->lp_ctx); smb->in.workgroup=workgroup; lp_smbcli_options(tctx->lp_ctx, &smb->in.options); lp_smbcli_session_options(tctx->lp_ctx, &smb->in.session_options); |