nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-05 21:42:47 -05:00
Code Issues Projects Releases Wiki Activity

RJK's patch to enable PuTTY's X forwarding to connect to local X

Browse Source 
servers using Unix sockets (on Unix only, obviously!).

[originally from svn r4263]
This commit is contained in:
Simon Tatham
2004-05-31 14:01:52 +00:00
parent b8e4b6f9b9
commit a2acc6ae0d
8 changed files with 176 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
unix/ux_x11.c
View File

@ -4,7 +4,9 @@
#include <ctype.h>
#include <unistd.h>
#include <assert.h>
#include "putty.h"
#include "ssh.h"
void platform_get_x11_auth(char *display, int *protocol,
unsigned char *data, int *datalen)
@ -15,15 +17,19 @@ void platform_get_x11_auth(char *display, int *protocol,
char *localbuf;
int proto = -1;
display = x11_display(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);
if (!strncmp(display, "localhost:", 10)
|| !strncmp(display, "unix:", 5))
command = dupprintf("xauth list %s 2>/dev/null",
strchr(display, ':'));
else
command = dupprintf("xauth list %s 2>/dev/null", display);
sfree(display);
fp = popen(command, "r");
sfree(command);
@ -113,3 +119,5 @@ void platform_get_x11_auth(char *display, int *protocol,
pclose(fp);
sfree(localbuf);
}
const char platform_x11_best_transport[] = "unix";