From b21f344079920194f94bbee7f44d8a6582e4d1a2 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 30 Nov 2011 08:33:29 +0100
Subject: s4:libcli: use smbcli_sock_connect() in smbcli_socket_connect()

metze
---
 source4/libcli/cliconnect.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'source4/libcli')

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index cdb04fb1f6..4047d36369 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -43,11 +43,17 @@ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server,
 	uint32_t timeout_msec = options->request_timeout * 1000;
 	NTSTATUS status;
 
-	sock = smbcli_sock_connect_byname(server, ports, NULL,
-					  resolve_ctx, ev_ctx,
-                      socket_options);
-
-	if (sock == NULL) return false;
+	status = smbcli_sock_connect(cli,
+				     NULL, /* host_addr */
+				     ports,
+				     server,
+				     resolve_ctx,
+				     ev_ctx,
+				     socket_options,
+				     &sock);
+	if (!NT_STATUS_IS_OK(status)) {
+		return false;
+	}
 
 	status = smbcli_transport_connect(sock,
 					  timeout_msec,
-- 
cgit