nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Log reason for failure to create a connection to a local X display.

Browse Source 
[originally from svn r8379]
This commit is contained in:
Jacob Nevins 2009-01-04 21:43:20 +00:00
parent 5611259468
commit 6b5f874552
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssh.c
View File

@ -7013,6 +7013,7 @@ static void ssh2_msg_channel_open(Ssh ssh, struct Packet *pktin)
if (typelen == 3 && !memcmp(type, "x11", 3)) { if (typelen == 3 && !memcmp(type, "x11", 3)) {
char *addrstr; char *addrstr;
const char *x11err;
ssh_pkt_getstring(pktin, &peeraddr, &peeraddrlen); ssh_pkt_getstring(pktin, &peeraddr, &peeraddrlen);
addrstr = snewn(peeraddrlen+1, char); addrstr = snewn(peeraddrlen+1, char);
@ -7025,8 +7026,9 @@ static void ssh2_msg_channel_open(Ssh ssh, struct Packet *pktin)
if (!ssh->X11_fwd_enabled) if (!ssh->X11_fwd_enabled)
error = "X11 forwarding is not enabled"; error = "X11 forwarding is not enabled";
else if (x11_init(&c->u.x11.s, ssh->x11disp, c, else if ((x11err = x11_init(&c->u.x11.s, ssh->x11disp, c,
addrstr, peerport, &ssh->cfg) != NULL) { addrstr, peerport, &ssh->cfg)) != NULL) {
logeventf(ssh, "Local X11 connection failed: %s", x11err);
error = "Unable to open an X11 connection"; error = "Unable to open an X11 connection";
} else { } else {
logevent("Opening X11 forward connection succeeded"); logevent("Opening X11 forward connection succeeded");