s4:libcli: do the nbss session request within smbcli_sock_connect_*()

[kai/samba.git] / source4 / libcli / cliconnect.c

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 4047d36369c9bdfcf6afaa454c88f789fac8bdd7..a8e86a04888e573e073580bde4db11c16aba3e98 100644 (file)
--- 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;