Hack around an oddity in X display names and xauth.

[u/mdw/putty] / unix / ux_x11.c

diff --git a/unix/ux_x11.c b/unix/ux_x11.c
index 7753c85..61b4f04 100644 (file)
--- a/unix/ux_x11.c
+++ b/unix/ux_x11.c
@@ -14,7 +14,15 @@ void platform_get_x11_auth(char *display, int *protocol,
     int maxsize = *datalen;
     char *localbuf;
 
-    command = dupprintf("xauth list %s 2>/dev/null", display);
+    /*
+     * Normally we should run `xauth list DISPLAYNAME'. However,
+     * there's an oddity when the display is local: the display
+     * `localhost:0' (or `:0') should become just `:0'.
+     */
+    if (!strncmp(display, "localhost:", 10))
+       command = dupprintf("xauth list %s 2>/dev/null", display+9);
+    else
+       command = dupprintf("xauth list %s 2>/dev/null", display);
     fp = popen(command, "r");
     sfree(command);