diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 22:13:47 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 22:13:47 +0100 |
| commit | 57a60f0920e77e26a3ce7f5d43540904ee4cbd8e (patch) | |
| tree | e7b6e5c410c93c334c3c7eaa1866e47e856e5cfe /source4/client/client.c | |
| parent | 3a6b88f9f91c74785444741e8a002bc901055f66 (diff) | |
| download | samba-57a60f0920e77e26a3ce7f5d43540904ee4cbd8e.tar.gz samba-57a60f0920e77e26a3ce7f5d43540904ee4cbd8e.tar.bz2 samba-57a60f0920e77e26a3ce7f5d43540904ee4cbd8e.zip | |
Move lp_*() calls a bit higher up the calls tack.
Diffstat (limited to 'source4/client/client.c')
| -rw-r--r-- | source4/client/client.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 02f46852b1..8936a3cf2f 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3102,7 +3102,8 @@ static int do_message_op(const char *netbios_name, const char *desthost, struct event_context *ev_ctx, struct resolve_context *resolve_ctx, struct smbcli_options *options, - struct smb_iconv_convenience *iconv_convenience) + struct smb_iconv_convenience *iconv_convenience, + const char *socket_options) { struct nbt_name called, calling; const char *server_name; @@ -3117,7 +3118,8 @@ static int do_message_op(const char *netbios_name, const char *desthost, if (!(cli = smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, destports, ev_ctx, resolve_ctx, options, - iconv_convenience)) { + iconv_convenience, + socket_options)) { d_printf("Connection to %s failed\n", server_name); return 1; } @@ -3270,7 +3272,8 @@ static int do_message_op(const char *netbios_name, const char *desthost, lp_smb_ports(cmdline_lp_ctx), dest_ip, name_type, ev_ctx, lp_resolve_context(cmdline_lp_ctx), - &smb_options, lp_iconv_convenience(cmdline_lp_ctx)); + &smb_options, lp_iconv_convenience(cmdline_lp_ctx), + lp_socket_options(cmdline_lp_ctx)); return rc; } |