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/libcli/smb_composite | |
| 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/libcli/smb_composite')
| -rw-r--r-- | source4/libcli/smb_composite/connect.c | 2 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/fetchfile.c | 1 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/fsinfo.c | 1 | ||||
| -rw-r--r-- | source4/libcli/smb_composite/smb_composite.h | 3 |
4 files changed, 6 insertions, 1 deletions
diff --git a/source4/libcli/smb_composite/connect.c b/source4/libcli/smb_composite/connect.c index a4137290bb..8af1756562 100644 --- a/source4/libcli/smb_composite/connect.c +++ b/source4/libcli/smb_composite/connect.c @@ -322,7 +322,7 @@ static NTSTATUS connect_socket(struct composite_context *c, /* the socket is up - we can initialise the smbcli transport layer */ state->transport = smbcli_transport_init(state->sock, state, true, - &io->in.options); + &io->in.options, io->in.iconv_convenience); NT_STATUS_HAVE_NO_MEMORY(state->transport); if (is_ipaddress(state->sock->hostname) && diff --git a/source4/libcli/smb_composite/fetchfile.c b/source4/libcli/smb_composite/fetchfile.c index ff4f0e7930..c46cda25df 100644 --- a/source4/libcli/smb_composite/fetchfile.c +++ b/source4/libcli/smb_composite/fetchfile.c @@ -145,6 +145,7 @@ struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetc state->connect->in.credentials = io->in.credentials; state->connect->in.fallback_to_anonymous = false; state->connect->in.workgroup = io->in.workgroup; + state->connect->in.iconv_convenience = io->in.iconv_convenience; state->connect->in.options = io->in.options; state->connect->in.session_options = io->in.session_options; diff --git a/source4/libcli/smb_composite/fsinfo.c b/source4/libcli/smb_composite/fsinfo.c index dc5327a29c..284fe84154 100644 --- a/source4/libcli/smb_composite/fsinfo.c +++ b/source4/libcli/smb_composite/fsinfo.c @@ -153,6 +153,7 @@ struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree, state->connect->in.credentials = io->in.credentials; state->connect->in.fallback_to_anonymous = false; state->connect->in.workgroup = io->in.workgroup; + state->connect->in.iconv_convenience = io->in.iconv_convenience; state->connect->in.options = tree->session->transport->options; state->connect->in.session_options = tree->session->options; diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h index 08ca40c833..fd1b95e64f 100644 --- a/source4/libcli/smb_composite/smb_composite.h +++ b/source4/libcli/smb_composite/smb_composite.h @@ -59,6 +59,7 @@ struct smb_composite_fetchfile { struct smbcli_options options; struct smbcli_session_options session_options; struct resolve_context *resolve_ctx; + struct smb_iconv_convenience *iconv_convenience; } in; struct { uint8_t *data; @@ -100,6 +101,7 @@ struct smb_composite_connect { const char *workgroup; struct smbcli_options options; struct smbcli_session_options session_options; + struct smb_iconv_convenience *iconv_convenience; } in; struct { struct smbcli_tree *tree; @@ -137,6 +139,7 @@ struct smb_composite_fsinfo { struct cli_credentials *credentials; const char *workgroup; enum smb_fsinfo_level level; + struct smb_iconv_convenience *iconv_convenience; } in; struct { |