diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 13:22:12 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-24 13:22:12 +0200 |
| commit | 284f523ec70477c408887a478e8392671f12dfff (patch) | |
| tree | 9945e37707ac8206c18da4653102c4993d6da65f /source4/libcli | |
| parent | 8b06312f7eeff5ea8625677478792888774bd2be (diff) | |
| download | samba-284f523ec70477c408887a478e8392671f12dfff.tar.gz samba-284f523ec70477c408887a478e8392671f12dfff.tar.bz2 samba-284f523ec70477c408887a478e8392671f12dfff.zip | |
Remove a few more usages of global_loadparm.
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/raw/clitransport.c | 5 | ||||
| -rw-r--r-- | source4/libcli/util/clilsa.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index 391efe0619..1dc5e4e766 100644 --- a/source4/libcli/raw/clitransport.c +++ b/source4/libcli/raw/clitransport.c @@ -168,15 +168,14 @@ struct smbcli_request *smbcli_transport_connect_send(struct smbcli_transport *tr DATA_BLOB calling_blob, called_blob; TALLOC_CTX *tmp_ctx = talloc_new(transport); NTSTATUS status; - struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(global_loadparm); status = nbt_name_dup(transport, called, &transport->called); if (!NT_STATUS_IS_OK(status)) goto failed; - status = nbt_name_to_blob(tmp_ctx, iconv_convenience, &calling_blob, calling); + status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &calling_blob, calling); if (!NT_STATUS_IS_OK(status)) goto failed; - status = nbt_name_to_blob(tmp_ctx, iconv_convenience, &called_blob, called); + status = nbt_name_to_blob(tmp_ctx, transport->iconv_convenience, &called_blob, called); if (!NT_STATUS_IS_OK(status)) goto failed; /* allocate output buffer */ diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c index abca8f49b2..13f7ab4704 100644 --- a/source4/libcli/util/clilsa.c +++ b/source4/libcli/util/clilsa.c @@ -81,7 +81,7 @@ static NTSTATUS smblsa_connect(struct smbcli_state *cli) lsa->ipc_tree->tid = tcon.tconx.out.tid; lsa->pipe = dcerpc_pipe_init(lsa, cli->transport->socket->event.ctx, - lp_iconv_convenience(global_loadparm)); + cli->transport->iconv_convenience); if (lsa->pipe == NULL) { talloc_free(lsa); return NT_STATUS_NO_MEMORY; |