s4-ipv6: allow for IPv6 in dcerpc socket calls
authorAndrew Tridgell <tridge@samba.org>
Mon, 6 Jun 2011 00:13:41 +0000 (10:13 +1000)
committerAndrew Tridgell <tridge@samba.org>
Mon, 6 Jun 2011 02:26:11 +0000 (12:26 +1000)
source4/librpc/rpc/dcerpc_sock.c

index f0451ac6745bb57c222b6ca2e321bfb5e02c8201..1cd4d7121ef71c2c9c373e6b9b63852d2dc5ee27 100644 (file)
@@ -389,7 +389,7 @@ static void continue_ip_resolve_name(struct composite_context *ctx)
        if (!composite_is_ok(c)) return;
 
        /* prepare server address using host ip:port and transport name */
-       s->srvaddr = socket_address_from_strings(s->conn, "ipv4", s->address, s->port);
+       s->srvaddr = socket_address_from_strings(s->conn, "ip", s->address, s->port);
        if (composite_nomem(s->srvaddr, c)) return;
 
        /* resolve_nbt_name gives only ipv4 ... - send socket open request */
@@ -423,7 +423,7 @@ static void continue_ipv6_open_socket(struct composite_context *ctx)
        talloc_free(s->srvaddr);
 
        /* prepare server address using host:ip and transport name */
-       s->srvaddr = socket_address_from_strings(s->conn, "ipv4", s->address, s->port);
+       s->srvaddr = socket_address_from_strings(s->conn, "ip", s->address, s->port);
        if (composite_nomem(s->srvaddr, c)) return;
 
        /* try IPv4 if IPv6 fails */