Integrate unfix.org's IPv6 patches up to level 10, with rather a lot

[u/mdw/putty] / x11fwd.c

diff --git a/x11fwd.c b/x11fwd.c
index 80362ec..52b320d 100644 (file)
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -242,7 +242,7 @@ char *x11_display(const char *display) {
        ret = dupstr(display);
     if(ret[0] == ':') {
        /* no transport specified, use whatever we think is best */
-       char *s = dupcat(platform_x11_best_transport, display, (char *)0);
+       char *s = dupcat(platform_x11_best_transport, ret, (char *)0);
        sfree(ret);
        return s;
     } else
@@ -301,7 +301,7 @@ const char *x11_init(Socket * s, char *display, void *c, void *auth,
        /*
         * Try to find host.
         */
-       addr = name_lookup(host, port, &dummy_realhost, cfg);
+       addr = name_lookup(host, port, &dummy_realhost, cfg, ADDRTYPE_UNSPEC);
        if ((err = sk_addr_error(addr)) != NULL) {
            sk_addr_free(addr);
            return err;