summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebian Python Modules Team <python-modules-team@lists.alioth.debian.org>2017-11-26 23:39:36 +0000
committerAndrew Shadura <andrewsh@debian.org>2017-11-26 23:39:36 +0000
commit60c72805777270d060c218eff5a1af4355ef5a42 (patch)
treed8d0e96343b65dcc0d9cd59e316b4183442430da
parent2d8e71cd1e86fb1da8619fd0e0d6d30eea1b5a9e (diff)
fix-ssh-tunnel-auth
=================================================================== Gbp-Pq: Name fix-ssh-tunnel-auth.patch
-rw-r--r--Xlib/support/unix_connect.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Xlib/support/unix_connect.py b/Xlib/support/unix_connect.py
index 3b16d5d..7659d94 100644
--- a/Xlib/support/unix_connect.py
+++ b/Xlib/support/unix_connect.py
@@ -179,6 +179,14 @@ def old_get_auth(sock, dname, host, dno):
except os.error:
pass
+ if not auth_data and host=='localhost':
+ # 127.0.0.1 counts as FamilyLocal, not FamilyInternet
+ # See Xtransutil.c:ConvertAddress.
+ # There might be more ways to spell 127.0.0.1 but
+ # 'localhost', yet this code fixes a the case of
+ # OpenSSH tunneling X.
+ return get_auth('unix:%d' % dno, 'unix', dno)
+
return auth_name, auth_data
get_auth = new_get_auth