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/cliconnect.c | |
parent | 5d146d0178d7da8d8f14f340dacb5b01fd03fab8 (diff) | |
download | samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.gz samba-8b06312f7eeff5ea8625677478792888774bd2be.tar.xz samba-8b06312f7eeff5ea8625677478792888774bd2be.zip |
Eliminate another instance of global_loadparm.
Diffstat (limited to 'source4/libcli/cliconnect.c')
-rw-r--r-- | source4/libcli/cliconnect.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index e42b04cdc57..1b3d2c98c95 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -35,7 +35,8 @@ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, const char **ports, struct event_context *ev_ctx, struct resolve_context *resolve_ctx, - struct smbcli_options *options) + struct smbcli_options *options, + struct smb_iconv_convenience *iconv_convenience) { struct smbcli_socket *sock; @@ -44,7 +45,8 @@ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server, if (sock == NULL) return false; - cli->transport = smbcli_transport_init(sock, cli, true, options); + cli->transport = smbcli_transport_init(sock, cli, true, options, + iconv_convenience); if (!cli->transport) { return false; } @@ -147,7 +149,8 @@ NTSTATUS smbcli_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 smbcli_tree *tree; NTSTATUS status; @@ -159,7 +162,8 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx, sharename, devtype, credentials, resolve_ctx, ev, options, - session_options); + session_options, + iconv_convenience); if (!NT_STATUS_IS_OK(status)) { goto done; } |