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 b0b8269..52b320d 100644 (file)
--- a/x11fwd.c
+++ b/x11fwd.c
@@ -1,3 +1,7 @@
+/*
+ * Platform-independent bits of X11 forwarding.
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -228,14 +232,21 @@ int x11_get_screen_number(char *display)
 
 /* Find the right display, returns an allocated string */
 char *x11_display(const char *display) {
-    if(!display || !*display)
-       if(!(display = getenv("DISPLAY")))
-           display = ":0";
-    if(display[0] == ':') {
+    char *ret;
+    if(!display || !*display) {
+       /* try to find platform-specific local display */
+       if(!(ret = platform_get_x_display()))
+           /* plausible default for all platforms */
+           ret = dupstr(":0");
+    } else
+       ret = dupstr(display);
+    if(ret[0] == ':') {
        /* no transport specified, use whatever we think is best */
-       return dupcat(platform_x11_best_transport, display, (char *)0);
+       char *s = dupcat(platform_x11_best_transport, ret, (char *)0);
+       sfree(ret);
+       return s;
     } else
-       return dupstr(display);
+       return ret;
 }
 
 /*
@@ -290,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;