s4:libcli: use smbcli_sock_connect() in smbcli_socket_connect()
authorStefan Metzmacher <metze@samba.org>
Wed, 30 Nov 2011 07:33:29 +0000 (08:33 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 30 Nov 2011 12:41:08 +0000 (13:41 +0100)
metze

source4/libcli/cliconnect.c

index cdb04fb1f6bdd15af03ee39d665c02e89df97de8..4047d36369c9bdfcf6afaa454c88f789fac8bdd7 100644 (file)
@@ -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,