s3: make cli_resolve_path return NTSTATUS
[kai/samba.git] / source3 / libsmb / namequery.c
index d561049a73807ce85bfd906013f9f99337531a20..dca740d3e6bb8d737c1d95ad2b82f411f33774c4 100644 (file)
@@ -208,6 +208,15 @@ static void set_socket_addr_v4(struct sockaddr_storage *addr)
        }
 }
 
+static struct in_addr my_socket_addr_v4(void)
+{
+       struct sockaddr_storage my_addr;
+       struct sockaddr_in *in_addr = (struct sockaddr_in *)((char *)&my_addr);
+
+       set_socket_addr_v4(&my_addr);
+       return in_addr->sin_addr;
+}
+
 /****************************************************************************
  Generate a random trn_id.
 ****************************************************************************/
@@ -237,7 +246,7 @@ static struct node_status *parse_node_status(TALLOC_CTX *mem_ctx, char *p,
        if (*num_names == 0)
                return NULL;
 
-       ret = TALLOC_ARRAY(mem_ctx, struct node_status,*num_names);
+       ret = talloc_array(mem_ctx, struct node_status,*num_names);
        if (!ret)
                return NULL;
 
@@ -1090,7 +1099,8 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count )
                }
 
                for ( j=i+1; j<count; j++ ) {
-                       if (sockaddr_equal((struct sockaddr *)&iplist[i].ss, (struct sockaddr *)&iplist[j].ss) &&
+                       if (sockaddr_equal((struct sockaddr *)(void *)&iplist[i].ss,
+                                          (struct sockaddr *)(void *)&iplist[j].ss) &&
                                        iplist[i].port == iplist[j].port) {
                                zero_sockaddr(&iplist[j].ss);
                        }
@@ -1117,7 +1127,7 @@ static int remove_duplicate_addrs2(struct ip_service *iplist, int count )
 static bool prioritize_ipv4_list(struct ip_service *iplist, int count)
 {
        TALLOC_CTX *frame = talloc_stackframe();
-       struct ip_service *iplist_new = TALLOC_ARRAY(frame, struct ip_service, count);
+       struct ip_service *iplist_new = talloc_array(frame, struct ip_service, count);
        int i, j;
 
        if (iplist_new == NULL) {
@@ -1317,7 +1327,7 @@ static bool name_query_validator(struct packet_struct *p, void *private_data)
                return false;
        }
 
-       tmp_addrs = TALLOC_REALLOC_ARRAY(
+       tmp_addrs = talloc_realloc(
                state, state->addrs, struct sockaddr_storage,
                state->num_addrs + nmb->answers->rdlength/6);
        if (tmp_addrs == NULL) {
@@ -1343,8 +1353,8 @@ static bool name_query_validator(struct packet_struct *p, void *private_data)
 
                for (j=0; j<state->num_addrs; j++) {
                        if (sockaddr_equal(
-                                   (struct sockaddr *)&addr,
-                                   (struct sockaddr *)&state->addrs[j])) {
+                                   (struct sockaddr *)(void *)&addr,
+                                   (struct sockaddr *)(void *)&state->addrs[j])) {
                                break;
                        }
                }
@@ -1423,9 +1433,18 @@ NTSTATUS name_query_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                req, struct name_query_state);
        NTSTATUS status;
 
-       if (tevent_req_is_nterror(req, &status)
-           && !NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
-               return status;
+       if (tevent_req_is_nterror(req, &status)) {
+               if (state->bcast &&
+                   NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
+                       /*
+                        * In the broadcast case we collect replies until the
+                        * timeout.
+                        */
+                       status = NT_STATUS_OK;
+               }
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
+               }
        }
        if (state->num_addrs == 0) {
                return NT_STATUS_NOT_FOUND;
@@ -1576,7 +1595,7 @@ static struct tevent_req *name_queries_send(
        if (!tevent_req_set_endtime(
                    subreq, state->ev,
                    timeval_current_ofs(0, state->timeout_msec * 1000))) {
-               tevent_req_nomem(NULL, req);
+               tevent_req_oom(req);
                return tevent_req_post(req, ev);
        }
        tevent_req_set_callback(subreq, name_queries_done, req);
@@ -1659,7 +1678,7 @@ static void name_queries_next(struct tevent_req *subreq)
        if (!tevent_req_set_endtime(
                    subreq, state->ev,
                    timeval_current_ofs(0, state->timeout_msec * 1000))) {
-               tevent_req_nomem(NULL, req);
+               tevent_req_oom(req);
                return;
        }
        state->subreqs[state->num_sent] = subreq;
@@ -1704,14 +1723,117 @@ static NTSTATUS name_queries_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-static NTSTATUS name_queries(const char *name, int name_type,
-                            bool bcast, bool recurse,
-                            const struct sockaddr_storage *addrs,
-                            int num_addrs, int wait_msec, int timeout_msec,
-                            TALLOC_CTX *mem_ctx,
-                            struct sockaddr_storage **result_addrs,
-                            int *num_result_addrs, uint8_t *flags,
-                            int *received_index)
+/********************************************************
+ Resolve via "bcast" method.
+*********************************************************/
+
+struct name_resolve_bcast_state {
+       struct sockaddr_storage *addrs;
+       int num_addrs;
+};
+
+static void name_resolve_bcast_done(struct tevent_req *subreq);
+
+struct tevent_req *name_resolve_bcast_send(TALLOC_CTX *mem_ctx,
+                                          struct tevent_context *ev,
+                                          const char *name,
+                                          int name_type)
+{
+       struct tevent_req *req, *subreq;
+       struct name_resolve_bcast_state *state;
+       struct sockaddr_storage *bcast_addrs;
+       int i, num_addrs, num_bcast_addrs;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct name_resolve_bcast_state);
+       if (req == NULL) {
+               return NULL;
+       }
+
+       if (lp_disable_netbios()) {
+               DEBUG(5, ("name_resolve_bcast(%s#%02x): netbios is disabled\n",
+                         name, name_type));
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               return tevent_req_post(req, ev);
+       }
+
+       /*
+        * "bcast" means do a broadcast lookup on all the local interfaces.
+        */
+
+       DEBUG(3, ("name_resolve_bcast: Attempting broadcast lookup "
+                 "for name %s<0x%x>\n", name, name_type));
+
+       num_addrs = iface_count();
+       bcast_addrs = talloc_array(state, struct sockaddr_storage, num_addrs);
+       if (tevent_req_nomem(bcast_addrs, req)) {
+               return tevent_req_post(req, ev);
+       }
+
+       /*
+        * Lookup the name on all the interfaces, return on
+        * the first successful match.
+        */
+       num_bcast_addrs = 0;
+
+       for (i=0; i<num_addrs; i++) {
+               const struct sockaddr_storage *pss = iface_n_bcast(i);
+
+               if (pss->ss_family != AF_INET) {
+                       continue;
+               }
+               bcast_addrs[num_bcast_addrs] = *pss;
+               num_bcast_addrs += 1;
+       }
+
+       subreq = name_queries_send(state, ev, name, name_type, true, true,
+                                  bcast_addrs, num_bcast_addrs, 0, 1000);
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, name_resolve_bcast_done, req);
+       return req;
+}
+
+static void name_resolve_bcast_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct name_resolve_bcast_state *state = tevent_req_data(
+               req, struct name_resolve_bcast_state);
+       NTSTATUS status;
+
+       status = name_queries_recv(subreq, state,
+                                  &state->addrs, &state->num_addrs,
+                                  NULL, NULL);
+       TALLOC_FREE(subreq);
+       if (tevent_req_nterror(req, status)) {
+               return;
+       }
+       tevent_req_done(req);
+}
+
+NTSTATUS name_resolve_bcast_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                                struct sockaddr_storage **addrs,
+                                int *num_addrs)
+{
+       struct name_resolve_bcast_state *state = tevent_req_data(
+               req, struct name_resolve_bcast_state);
+       NTSTATUS status;
+
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+       *addrs = talloc_move(mem_ctx, &state->addrs);
+       *num_addrs = state->num_addrs;
+       return NT_STATUS_OK;
+}
+
+NTSTATUS name_resolve_bcast(const char *name,
+                       int name_type,
+                       TALLOC_CTX *mem_ctx,
+                       struct sockaddr_storage **return_iplist,
+                       int *return_count)
 {
        TALLOC_CTX *frame = talloc_stackframe();
        struct event_context *ev;
@@ -1722,120 +1844,189 @@ static NTSTATUS name_queries(const char *name, int name_type,
        if (ev == NULL) {
                goto fail;
        }
-       req = name_queries_send(frame, ev, name, name_type, bcast,
-                               recurse, addrs, num_addrs, wait_msec,
-                               timeout_msec);
+       req = name_resolve_bcast_send(frame, ev, name, name_type);
        if (req == NULL) {
                goto fail;
        }
        if (!tevent_req_poll_ntstatus(req, ev, &status)) {
                goto fail;
        }
-       status = name_queries_recv(req, mem_ctx, result_addrs,
-                                  num_result_addrs, flags, received_index);
+       status = name_resolve_bcast_recv(req, mem_ctx, return_iplist,
+                                        return_count);
  fail:
        TALLOC_FREE(frame);
        return status;
 }
 
-/********************************************************
- Resolve via "bcast" method.
-*********************************************************/
+struct query_wins_list_state {
+       struct tevent_context *ev;
+       const char *name;
+       uint8_t name_type;
+       struct in_addr *servers;
+       uint32_t num_servers;
+       struct sockaddr_storage server;
+       uint32_t num_sent;
 
-NTSTATUS name_resolve_bcast(const char *name,
-                       int name_type,
-                       TALLOC_CTX *mem_ctx,
-                       struct sockaddr_storage **return_iplist,
-                       int *return_count)
+       struct sockaddr_storage *addrs;
+       int num_addrs;
+       uint8_t flags;
+};
+
+static void query_wins_list_done(struct tevent_req *subreq);
+
+/*
+ * Query a list of (replicating) wins servers in sequence, call them
+ * dead if they don't reply
+ */
+
+static struct tevent_req *query_wins_list_send(
+       TALLOC_CTX *mem_ctx, struct tevent_context *ev,
+       struct in_addr src_ip, const char *name, uint8_t name_type,
+       struct in_addr *servers, int num_servers)
 {
-       int i;
-       int num_interfaces = iface_count();
-       struct sockaddr_storage *ss_list;
-       NTSTATUS status = NT_STATUS_NOT_FOUND;
+       struct tevent_req *req, *subreq;
+       struct query_wins_list_state *state;
 
-       if (lp_disable_netbios()) {
-               DEBUG(5,("name_resolve_bcast(%s#%02x): netbios is disabled\n",
-                                       name, name_type));
-               return NT_STATUS_INVALID_PARAMETER;
+       req = tevent_req_create(mem_ctx, &state,
+                               struct query_wins_list_state);
+       if (req == NULL) {
+               return NULL;
        }
+       state->ev = ev;
+       state->name = name;
+       state->name_type = name_type;
+       state->servers = servers;
+       state->num_servers = num_servers;
 
-       *return_iplist = NULL;
-       *return_count = 0;
+       if (state->num_servers == 0) {
+               tevent_req_nterror(req, NT_STATUS_NOT_FOUND);
+               return tevent_req_post(req, ev);
+       }
 
-       /*
-        * "bcast" means do a broadcast lookup on all the local interfaces.
-        */
+       in_addr_to_sockaddr_storage(
+               &state->server, state->servers[state->num_sent]);
 
-       DEBUG(3,("name_resolve_bcast: Attempting broadcast lookup "
-               "for name %s<0x%x>\n", name, name_type));
+       subreq = name_query_send(state, state->ev,
+                                state->name, state->name_type,
+                                false, true, &state->server);
+       state->num_sent += 1;
+       if (tevent_req_nomem(subreq, req)) {
+               return tevent_req_post(req, ev);
+       }
+       if (!tevent_req_set_endtime(subreq, state->ev,
+                                   timeval_current_ofs(2, 0))) {
+               tevent_req_oom(req);
+               return tevent_req_post(req, ev);
+       }
+       tevent_req_set_callback(subreq, query_wins_list_done, req);
+       return req;
+}
 
-       /*
-        * Lookup the name on all the interfaces, return on
-        * the first successful match.
-        */
-       for( i = num_interfaces-1; i >= 0; i--) {
-               const struct sockaddr_storage *pss = iface_n_bcast(i);
+static void query_wins_list_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct query_wins_list_state *state = tevent_req_data(
+               req, struct query_wins_list_state);
+       NTSTATUS status;
 
-               /* Done this way to fix compiler error on IRIX 5.x */
-               if (!pss) {
-                       continue;
-               }
-               status = name_query(name, name_type, true, true, pss,
-                                   talloc_tos(), &ss_list, return_count,
-                                   NULL);
-               if (NT_STATUS_IS_OK(status)) {
-                       goto success;
-               }
+       status = name_query_recv(subreq, state,
+                                &state->addrs, &state->num_addrs,
+                                &state->flags);
+       TALLOC_FREE(subreq);
+       if (NT_STATUS_IS_OK(status)) {
+               tevent_req_done(req);
+               return;
+       }
+       if (!NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
+               tevent_req_nterror(req, status);
+               return;
        }
+       wins_srv_died(state->servers[state->num_sent-1],
+                     my_socket_addr_v4());
 
-       /* failed - no response */
+       if (state->num_sent == state->num_servers) {
+               tevent_req_nterror(req, NT_STATUS_NOT_FOUND);
+               return;
+       }
 
-       return status;
+       in_addr_to_sockaddr_storage(
+               &state->server, state->servers[state->num_sent]);
 
-success:
-       *return_iplist = ss_list;
-       return status;
+       subreq = name_query_send(state, state->ev,
+                                state->name, state->name_type,
+                                false, true, &state->server);
+       state->num_sent += 1;
+       if (tevent_req_nomem(subreq, req)) {
+               return;
+       }
+       if (!tevent_req_set_endtime(subreq, state->ev,
+                                   timeval_current_ofs(2, 0))) {
+               tevent_req_oom(req);
+               return;
+       }
+       tevent_req_set_callback(subreq, query_wins_list_done, req);
 }
 
-/********************************************************
- Resolve via "wins" method.
-*********************************************************/
-
-NTSTATUS resolve_wins(const char *name,
-               int name_type,
-               struct ip_service **return_iplist,
-               int *return_count)
+static NTSTATUS query_wins_list_recv(struct tevent_req *req,
+                                    TALLOC_CTX *mem_ctx,
+                                    struct sockaddr_storage **addrs,
+                                    int *num_addrs,
+                                    uint8_t *flags)
 {
-       int t, i;
-       char **wins_tags;
-       struct sockaddr_storage src_ss, *ss_list = NULL;
-       struct in_addr src_ip;
+       struct query_wins_list_state *state = tevent_req_data(
+               req, struct query_wins_list_state);
        NTSTATUS status;
 
-       if (lp_disable_netbios()) {
-               DEBUG(5,("resolve_wins(%s#%02x): netbios is disabled\n",
-                                       name, name_type));
-               return NT_STATUS_INVALID_PARAMETER;
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+       if (addrs != NULL) {
+               *addrs = talloc_move(mem_ctx, &state->addrs);
        }
+       if (num_addrs != NULL) {
+               *num_addrs = state->num_addrs;
+       }
+       if (flags != NULL) {
+               *flags = state->flags;
+       }
+       return NT_STATUS_OK;
+}
 
-       *return_iplist = NULL;
-       *return_count = 0;
+struct resolve_wins_state {
+       int num_sent;
+       int num_received;
 
-       DEBUG(3,("resolve_wins: Attempting wins lookup for name %s<0x%x>\n",
-                               name, name_type));
+       struct sockaddr_storage *addrs;
+       int num_addrs;
+       uint8_t flags;
+};
+
+static void resolve_wins_done(struct tevent_req *subreq);
+
+struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx,
+                                    struct tevent_context *ev,
+                                    const char *name,
+                                    int name_type)
+{
+       struct tevent_req *req, *subreq;
+       struct resolve_wins_state *state;
+       char **wins_tags = NULL;
+       struct sockaddr_storage src_ss;
+       struct in_addr src_ip;
+       int i, num_wins_tags;
+
+       req = tevent_req_create(mem_ctx, &state,
+                               struct resolve_wins_state);
+       if (req == NULL) {
+               return NULL;
+       }
 
        if (wins_srv_count() < 1) {
                DEBUG(3,("resolve_wins: WINS server resolution selected "
                        "and no WINS servers listed.\n"));
-               return NT_STATUS_INVALID_PARAMETER;
-       }
-
-       /* we try a lookup on each of the WINS tags in turn */
-       wins_tags = wins_srv_tags();
-
-       if (!wins_tags) {
-               /* huh? no tags?? give up in disgust */
-               return NT_STATUS_INVALID_PARAMETER;
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               goto fail;
        }
 
        /* the address we will be sending from */
@@ -1850,80 +2041,164 @@ NTSTATUS resolve_wins(const char *name,
                DEBUG(3,("resolve_wins: cannot receive WINS replies "
                        "on IPv6 address %s\n",
                        addr));
-               wins_srv_tags_free(wins_tags);
-               return NT_STATUS_INVALID_PARAMETER;
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               goto fail;
        }
 
-       src_ip = ((struct sockaddr_in *)&src_ss)->sin_addr;
+       src_ip = ((const struct sockaddr_in *)(void *)&src_ss)->sin_addr;
+
+       wins_tags = wins_srv_tags();
+       if (wins_tags == NULL) {
+               tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
+               goto fail;
+       }
+
+       num_wins_tags = 0;
+       while (wins_tags[num_wins_tags] != NULL) {
+               num_wins_tags += 1;
+       }
+
+       for (i=0; i<num_wins_tags; i++) {
+               int num_servers, num_alive;
+               struct in_addr *servers, *alive;
+               int j;
+
+               if (!wins_server_tag_ips(wins_tags[i], talloc_tos(),
+                                        &servers, &num_servers)) {
+                       DEBUG(10, ("wins_server_tag_ips failed for tag %s\n",
+                                  wins_tags[i]));
+                       continue;
+               }
 
-       /* in the worst case we will try every wins server with every
-          tag! */
-       for (t=0; wins_tags && wins_tags[t]; t++) {
-               int srv_count = wins_srv_count_tag(wins_tags[t]);
-               for (i=0; i<srv_count; i++) {
-                       struct sockaddr_storage wins_ss;
-                       struct in_addr wins_ip;
+               alive = talloc_array(state, struct in_addr, num_servers);
+               if (tevent_req_nomem(alive, req)) {
+                       goto fail;
+               }
 
-                       wins_ip = wins_srv_ip_tag(wins_tags[t], src_ip);
+               num_alive = 0;
+               for (j=0; j<num_servers; j++) {
+                       struct in_addr wins_ip = servers[j];
 
                        if (global_in_nmbd && ismyip_v4(wins_ip)) {
                                /* yikes! we'll loop forever */
                                continue;
                        }
-
                        /* skip any that have been unresponsive lately */
                        if (wins_srv_is_dead(wins_ip, src_ip)) {
                                continue;
                        }
+                       DEBUG(3, ("resolve_wins: using WINS server %s "
+                                "and tag '%s'\n",
+                                 inet_ntoa(wins_ip), wins_tags[i]));
+                       alive[num_alive] = wins_ip;
+                       num_alive += 1;
+               }
+               TALLOC_FREE(servers);
 
-                       DEBUG(3,("resolve_wins: using WINS server %s "
-                               "and tag '%s'\n",
-                               inet_ntoa(wins_ip), wins_tags[t]));
+               if (num_alive == 0) {
+                       continue;
+               }
 
-                       in_addr_to_sockaddr_storage(&wins_ss, wins_ip);
-                       status = name_query(name,
-                                               name_type,
-                                               false,
-                                               true,
-                                               &wins_ss,
-                                               talloc_tos(),
-                                               &ss_list,
-                                               return_count,
-                                               NULL);
+               subreq = query_wins_list_send(
+                       state, ev, src_ip, name, name_type,
+                       alive, num_alive);
+               if (tevent_req_nomem(subreq, req)) {
+                       goto fail;
+               }
+               tevent_req_set_callback(subreq, resolve_wins_done, req);
+               state->num_sent += 1;
+       }
 
-                       /* exit loop if we got a list of addresses */
+       if (state->num_sent == 0) {
+               tevent_req_nterror(req, NT_STATUS_NOT_FOUND);
+               goto fail;
+       }
 
-                       if (NT_STATUS_IS_OK(status)) {
-                               goto success;
-                       }
+       wins_srv_tags_free(wins_tags);
+       return req;
+fail:
+       wins_srv_tags_free(wins_tags);
+       return tevent_req_post(req, ev);
+}
 
-                       if (NT_STATUS_EQUAL(status,
-                                           NT_STATUS_IO_TIMEOUT)) {
-                               /* Timed out waiting for WINS server to
-                                * respond.
-                                * Mark it dead. */
-                               wins_srv_died(wins_ip, src_ip);
-                       } else {
-                               /* The name definitely isn't in this
-                                  group of WINS servers.
-                                  goto the next group  */
-                               break;
-                       }
-               }
+static void resolve_wins_done(struct tevent_req *subreq)
+{
+       struct tevent_req *req = tevent_req_callback_data(
+               subreq, struct tevent_req);
+       struct resolve_wins_state *state = tevent_req_data(
+               req, struct resolve_wins_state);
+       NTSTATUS status;
+
+       status = query_wins_list_recv(subreq, state, &state->addrs,
+                                     &state->num_addrs, &state->flags);
+       if (NT_STATUS_IS_OK(status)) {
+               tevent_req_done(req);
+               return;
        }
 
-       wins_srv_tags_free(wins_tags);
-       return NT_STATUS_NO_LOGON_SERVERS;
+       state->num_received += 1;
 
-success:
+       if (state->num_received < state->num_sent) {
+               /*
+                * Wait for the others
+                */
+               return;
+       }
+       tevent_req_nterror(req, status);
+}
 
-       status = NT_STATUS_OK;
-       if (!convert_ss2service(return_iplist, ss_list, *return_count))
-               status = NT_STATUS_INVALID_PARAMETER;
+NTSTATUS resolve_wins_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
+                          struct sockaddr_storage **addrs,
+                          int *num_addrs, uint8_t *flags)
+{
+       struct resolve_wins_state *state = tevent_req_data(
+               req, struct resolve_wins_state);
+       NTSTATUS status;
 
-       TALLOC_FREE(ss_list);
-       wins_srv_tags_free(wins_tags);
+       if (tevent_req_is_nterror(req, &status)) {
+               return status;
+       }
+       if (addrs != NULL) {
+               *addrs = talloc_move(mem_ctx, &state->addrs);
+       }
+       if (num_addrs != NULL) {
+               *num_addrs = state->num_addrs;
+       }
+       if (flags != NULL) {
+               *flags = state->flags;
+       }
+       return NT_STATUS_OK;
+}
+
+/********************************************************
+ Resolve via "wins" method.
+*********************************************************/
 
+NTSTATUS resolve_wins(const char *name,
+               int name_type,
+               TALLOC_CTX *mem_ctx,
+               struct sockaddr_storage **return_iplist,
+               int *return_count)
+{
+       struct tevent_context *ev;
+       struct tevent_req *req;
+       NTSTATUS status = NT_STATUS_NO_MEMORY;
+
+       ev = tevent_context_init(talloc_tos());
+       if (ev == NULL) {
+               goto fail;
+       }
+       req = resolve_wins_send(ev, ev, name, name_type);
+       if (req == NULL) {
+               goto fail;
+       }
+       if (!tevent_req_poll_ntstatus(req, ev, &status)) {
+               goto fail;
+       }
+       status = resolve_wins_recv(req, mem_ctx, return_iplist, return_count,
+                                  NULL);
+fail:
+       TALLOC_FREE(ev);
        return status;
 }
 
@@ -2318,11 +2593,18 @@ NTSTATUS internal_resolve_name(const char *name,
                        }
                } else if(strequal( tok, "wins")) {
                        /* don't resolve 1D via WINS */
+                       struct sockaddr_storage *ss_list;
                        if (name_type != 0x1D) {
                                status = resolve_wins(name, name_type,
-                                                     return_iplist,
+                                                     talloc_tos(),
+                                                     &ss_list,
                                                      return_count);
                                if (NT_STATUS_IS_OK(status)) {
+                                       if (!convert_ss2service(return_iplist,
+                                                               ss_list,
+                                                               *return_count)) {
+                                               status = NT_STATUS_NO_MEMORY;
+                                       }
                                        goto done;
                                }
                        }
@@ -2432,7 +2714,7 @@ bool resolve_name(const char *name,
                if (prefer_ipv4) {
                        for (i=0; i<count; i++) {
                                if (!is_zero_addr(&ss_list[i].ss) &&
-                                               !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss) &&
+                                   !is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss) &&
                                                (ss_list[i].ss.ss_family == AF_INET)) {
                                        *return_ss = ss_list[i].ss;
                                        SAFE_FREE(ss_list);
@@ -2445,7 +2727,7 @@ bool resolve_name(const char *name,
                /* only return valid addresses for TCP connections */
                for (i=0; i<count; i++) {
                        if (!is_zero_addr(&ss_list[i].ss) &&
-                                       !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss)) {
+                           !is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss)) {
                                *return_ss = ss_list[i].ss;
                                SAFE_FREE(ss_list);
                                SAFE_FREE(sitename);
@@ -2483,7 +2765,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
        *return_ss_arr = NULL;
 
        if (is_ipaddress(name)) {
-               *return_ss_arr = TALLOC_P(ctx, struct sockaddr_storage);
+               *return_ss_arr = talloc(ctx, struct sockaddr_storage);
                if (!*return_ss_arr) {
                        return NT_STATUS_NO_MEMORY;
                }
@@ -2509,7 +2791,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
        /* only return valid addresses for TCP connections */
        for (i=0, num_entries = 0; i<count; i++) {
                if (!is_zero_addr(&ss_list[i].ss) &&
-                               !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss)) {
+                   !is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss)) {
                        num_entries++;
                }
        }
@@ -2518,7 +2800,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
                return NT_STATUS_BAD_NETWORK_NAME;
        }
 
-       *return_ss_arr = TALLOC_ARRAY(ctx,
+       *return_ss_arr = talloc_array(ctx,
                                struct sockaddr_storage,
                                num_entries);
        if (!(*return_ss_arr)) {
@@ -2528,7 +2810,7 @@ NTSTATUS resolve_name_list(TALLOC_CTX *ctx,
 
        for (i=0, num_entries = 0; i<count; i++) {
                if (!is_zero_addr(&ss_list[i].ss) &&
-                               !is_broadcast_addr((struct sockaddr *)&ss_list[i].ss)) {
+                   !is_broadcast_addr((struct sockaddr *)(void *)&ss_list[i].ss)) {
                        (*return_ss_arr)[num_entries++] = ss_list[i].ss;
                }
        }