simon-svn: putty: jacob
Commits to Tartarus CVS repository.
tartarus-commits at lists.tartarus.org
Tue Feb 24 01:01:23 GMT 2009
SVN root: svn://svn.tartarus.org/sgt
Changes by: jacob
Revision: 8462
Date: 2009-02-24 01:01:23 +0000 (Tue, 24 Feb 2009)
Log message (18 lines):
Since r8305, Unix PuTTY has always "upgraded" an X11 display like "localhost:0"
to a Unix-domain socket. This typically works fine when PuTTY is run on the
same machine as the X server, but it's broken multi-hop X forwarding through
OpenSSH; when OpenSSH creates a proxy X server "localhost:10", it only listens
on TCP, not on a Unix-domain socket.
Instead, when deciding on the details of the display, we actively probe to see
if there's a Unix-domain socket we can use instead, and only use it if it's
there, falling back to the specified IP "localhost" if not.
Independently, when looking for local auth details in Xauthority for a
"localhost" TCP display, we prefer a matching Unix-domain entry, but will fall
back to an IP "localhost" entry (which would be unusual, but we don't trust a
Windows X server not to do it) -- this is a generalisation of the special case
added in r2538 (but removed in r8305, as the automatic upgrade masked the need
for it).
(This is now done in platform-independent code, so a side-effect is that
get_hostname() is now part of the networking abstraction on all platforms.)
Modified files:
U putty/network.h
U putty/unix/ux_x11.c
U putty/unix/uxnet.c
U putty/windows/winnet.c
U putty/x11fwd.c
Links:
http://svn.tartarus.org/sgt/?rev=8462&view=rev
http://svn.tartarus.org/sgt/putty/network.h?rev=8462&r1=8461&r2=8462
http://svn.tartarus.org/sgt/putty/unix/ux_x11.c?rev=8462&r1=8461&r2=8462
http://svn.tartarus.org/sgt/putty/unix/uxnet.c?rev=8462&r1=8461&r2=8462
http://svn.tartarus.org/sgt/putty/windows/winnet.c?rev=8462&r1=8461&r2=8462
http://svn.tartarus.org/sgt/putty/x11fwd.c?rev=8462&r1=8461&r2=8462
More information about the tartarus-commits
mailing list