*sigh* X11 forwarding to a local display (":0" or similar) specified in the

environment rather than the configuraton was failing as of 0.56 (introduced
in r4604). This probably only bit users of Unix PuTTY. Didn't spot in testing
as I was forwarding to already-forwarded displays. I really wasn't having a
good month that month, was I?

[originally from svn r4816]
[r4604 == 98028c746f08d0e7bf5d8524d6aca85e5a2f4145]

diff --git a/x11fwd.c b/x11fwd.c
index 80362ec0293d6279f26431ff48f5de1573c6ebdc..d748da1377584026c4bd1b1b9b420812dc953d92 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