From 99ef6a4bec1058b3649e5e72f8ea85f6df93a154 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 30 Nov 2011 08:50:11 +0100
Subject: s4:libcli: do the nbss session request within smbcli_sock_connect_*()

metze
---
 source4/libcli/cliconnect.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'source4/libcli/cliconnect.c')

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 4047d36369..a8e86a0488 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -39,8 +39,7 @@ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server,
 			   struct nbt_name *calling,
 			   struct nbt_name *called)
 {
-	struct smbcli_socket *sock;
-	uint32_t timeout_msec = options->request_timeout * 1000;
+	struct smbcli_socket *sock = NULL;
 	NTSTATUS status;
 
 	status = smbcli_sock_connect(cli,
@@ -50,18 +49,13 @@ bool smbcli_socket_connect(struct smbcli_state *cli, const char *server,
 				     resolve_ctx,
 				     ev_ctx,
 				     socket_options,
+				     calling,
+				     called,
 				     &sock);
 	if (!NT_STATUS_IS_OK(status)) {
 		return false;
 	}
 
-	status = smbcli_transport_connect(sock,
-					  timeout_msec,
-					  calling, called);
-	if (!NT_STATUS_IS_OK(status)) {
-		return false;
-	}
-
 	cli->transport = smbcli_transport_init(sock, cli, true, options);
 	if (!cli->transport) {
 		return false;
-- 
cgit