summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDebian Python Modules Team <python-modules-team@lists.alioth.debian.org>2020-09-21 12:00:17 +0200
committerAndrej Shadura <andrewsh@debian.org>2020-09-21 12:00:17 +0200
commit7c9aa041f0496d15fe5f4e09060d8dcbe23242ed (patch)
treec680410cf2d88c2a33d72b3686be0aea18ba38a1
parent6a130448cba0852cc9bdc3e05c6acc53cf879c23 (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 4112c0f..f8561b7 100644
--- a/Xlib/support/unix_connect.py
+++ b/Xlib/support/unix_connect.py
@@ -201,6 +201,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