summaryrefslogtreecommitdiff
path: root/source4/libcli/raw
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/libcli/raw
parent5d146d0178d7da8d8f14f340dacb5b01fd03fab8 (diff)
downloadsamba-8b06312f7eeff5ea8625677478792888774bd2be.tar.gz
samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.bz2
samba-8b06312f7eeff5ea8625677478792888774bd2be.zip
Eliminate another instance of global_loadparm.
Diffstat (limited to 'source4/libcli/raw')
-rw-r--r--source4/libcli/raw/clitransport.c4
-rw-r--r--source4/libcli/raw/clitree.c4
-rw-r--r--source4/libcli/raw/libcliraw.h3
3 files changed, 9 insertions, 2 deletions
diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c
index db43c9e20c..391efe0619 100644
--- a/source4/libcli/raw/clitransport.c
+++ b/source4/libcli/raw/clitransport.c
@@ -76,7 +76,8 @@ static NTSTATUS smbcli_transport_finish_recv(void *private, DATA_BLOB blob);
struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
TALLOC_CTX *parent_ctx,
bool primary,
- struct smbcli_options *options)
+ struct smbcli_options *options,
+ struct smb_iconv_convenience *iconv_convenience)
{
struct smbcli_transport *transport;
@@ -91,6 +92,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
transport->negotiate.protocol = PROTOCOL_NT1;
transport->options = *options;
transport->negotiate.max_xmit = transport->options.max_xmit;
+ transport->iconv_convenience = iconv_convenience;
/* setup the stream -> packet parser */
transport->packet = packet_init(transport);
diff --git a/source4/libcli/raw/clitree.c b/source4/libcli/raw/clitree.c
index ccfb28b84d..08f611941d 100644
--- a/source4/libcli/raw/clitree.c
+++ b/source4/libcli/raw/clitree.c
@@ -178,7 +178,8 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
struct resolve_context *resolve_ctx,
struct event_context *ev,
struct smbcli_options *options,
- struct smbcli_session_options *session_options)
+ struct smbcli_session_options *session_options,
+ struct smb_iconv_convenience *iconv_convenience)
{
struct smb_composite_connect io;
NTSTATUS status;
@@ -201,6 +202,7 @@ NTSTATUS smbcli_tree_full_connection(TALLOC_CTX *parent_ctx,
io.in.workgroup = "";
io.in.options = *options;
io.in.session_options = *session_options;
+ io.in.iconv_convenience = iconv_convenience;
status = smb_composite_connect(&io, parent_ctx, resolve_ctx, ev);
if (NT_STATUS_IS_OK(status)) {
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index bd9bda0db1..98f18b1ed5 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -162,6 +162,9 @@ struct smbcli_transport {
/* context of the stream -> packet parser */
struct packet_context *packet;
+
+ /* iconv convenience */
+ struct smb_iconv_convenience *iconv_convenience;
};
/* this is the context for the user */