s4-ipv6: allow for IPv6 in resolver top level calls
authorAndrew Tridgell <tridge@samba.org>
Mon, 6 Jun 2011 00:13:20 +0000 (10:13 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 6 Jun 2011 02:26:11 +0000 (12:26 +1000)
source4/libcli/resolve/resolve.c

index ef61c38f79ff24a445beb0ecf8aabde9428c91ce..b5930aade1fd1d2bbb39f22487e09b524e26d0a4 100644 (file)
@@ -171,12 +171,10 @@ struct composite_context *resolve_name_all_send(struct resolve_context *ctx,
 
        if (is_ipaddress(state->name.name) || 
            strcasecmp(state->name.name, "localhost") == 0) {
-               struct in_addr ip = interpret_addr2(state->name.name);
-
                state->addrs = talloc_array(state, struct socket_address *, 2);
                if (composite_nomem(state->addrs, c)) return c;
-               state->addrs[0] = socket_address_from_strings(state->addrs, "ipv4",
-                                                             inet_ntoa(ip), 0);
+               state->addrs[0] = socket_address_from_strings(state->addrs, "ip",
+                                                             state->name.name, 0);
                if (composite_nomem(state->addrs[0], c)) return c;
                state->addrs[1] = NULL;
                state->names = talloc_array(state, char *, 2);