From 4877be53df1181f75d603fa4edc67c34e1ba5141 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 30 Nov 2011 07:17:31 +0100 Subject: s4:libcli: move smbcli_transport_establish() logic into smbcli_socket_connect() metze --- source4/client/client.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'source4/client') diff --git a/source4/client/client.c b/source4/client/client.c index 57686bb7ba..d7adc41ca1 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -3184,6 +3184,7 @@ static int do_message_op(const char *netbios_name, const char *desthost, struct nbt_name called, calling; const char *server_name; struct smbcli_state *cli; + bool ok; make_nbt_name_client(&calling, netbios_name); @@ -3191,17 +3192,18 @@ static int do_message_op(const char *netbios_name, const char *desthost, server_name = destip ? destip : desthost; - if (!(cli = smbcli_state_init(NULL)) || - !smbcli_socket_connect(cli, server_name, destports, - ev_ctx, resolve_ctx, options, - socket_options)) { - d_printf("Connection to %s failed\n", server_name); + cli = smbcli_state_init(NULL); + if (cli == NULL) { + d_printf("smbcli_state_init() failed\n"); return 1; } - if (!smbcli_transport_establish(cli, &calling, &called)) { - d_printf("session request failed\n"); - talloc_free(cli); + ok = smbcli_socket_connect(cli, server_name, destports, + ev_ctx, resolve_ctx, options, + socket_options, + &calling, &called); + if (!ok) { + d_printf("Connection to %s failed\n", server_name); return 1; } -- cgit