diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-10 18:41:19 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:12 +0100 |
| commit | 5f4842cf65ce64bfdf577cd549565da20ca818cf (patch) | |
| tree | 65f9cb14c5910e70bc0fb64f45c7ffa5e382692f /source4/client | |
| parent | eba25f5d1897fbe61e8d7c623fcacb647629bf07 (diff) | |
| download | samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.tar.gz samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.tar.bz2 samba-5f4842cf65ce64bfdf577cd549565da20ca818cf.zip | |
r26376: Add context for libcli_resolve.
(This used to be commit 459e1466a411d6f83b7372e248566e6e71c745fc)
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 43135e13ea..98b13aba4c 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3061,7 +3061,7 @@ static int do_host_query(struct loadparm_context *lp_ctx, const char *query_host /**************************************************************************** handle a message operation ****************************************************************************/ -static int do_message_op(const char *netbios_name, const char *desthost, const char *destip, int name_type, const char **name_resolve_order, int max_xmit, int max_mux) +static int do_message_op(const char *netbios_name, const char *desthost, const char *destip, int name_type, struct resolve_context *resolve_ctx, int max_xmit, int max_mux) { struct nbt_name called, calling; const char *server_name; @@ -3073,7 +3073,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c server_name = destip ? destip : desthost; - if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, name_resolve_order, max_xmit, max_mux)) { + if (!(cli=smbcli_state_init(NULL)) || !smbcli_socket_connect(cli, server_name, resolve_ctx, max_xmit, max_mux)) { d_printf("Connection to %s failed\n", server_name); return 1; } @@ -3221,7 +3221,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, const c } if (message) { - return do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost, dest_ip, name_type, lp_name_resolve_order(cmdline_lp_ctx), lp_max_xmit(cmdline_lp_ctx), lp_maxmux(cmdline_lp_ctx)); + return do_message_op(lp_netbios_name(cmdline_lp_ctx), desthost, dest_ip, name_type, lp_resolve_context(cmdline_lp_ctx), lp_max_xmit(cmdline_lp_ctx), lp_maxmux(cmdline_lp_ctx)); } if (!do_connect(ctx, desthost, service, cmdline_credentials)) |