summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-06-06 10:13:20 +1000
committerAndrew Tridgell <tridge@samba.org>2011-06-06 12:26:11 +1000
commitd8e2302330db1b4d1c5b29608823d46a03fd087a (patch)
treeb0941bda391f1a1cf3b6d8b55b835b2c82cd6fe2
parent3736f29696288f908aac4189aedfc7149c431caa (diff)
downloadsamba-d8e2302330db1b4d1c5b29608823d46a03fd087a.tar.gz
samba-d8e2302330db1b4d1c5b29608823d46a03fd087a.tar.bz2
samba-d8e2302330db1b4d1c5b29608823d46a03fd087a.zip
s4-ipv6: allow for IPv6 in resolver top level calls
-rw-r--r--source4/libcli/resolve/resolve.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/libcli/resolve/resolve.c b/source4/libcli/resolve/resolve.c
index ef61c38f79..b5930aade1 100644
--- a/source4/libcli/resolve/resolve.c
+++ b/source4/libcli/resolve/resolve.c
@@ -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);