|
 |
184e0d |
From b81faa983634e9dcb409157b95e79a7c28a66c10 Mon Sep 17 00:00:00 2001
|
|
|
184e0d |
In-Reply-To: <6ee28a662c511063cd5edc32b6a613aa84cff3b9.1493385541.git.phrdina@redhat.com>
|
|
|
184e0d |
References: <6ee28a662c511063cd5edc32b6a613aa84cff3b9.1493385541.git.phrdina@redhat.com>
|
|
|
184e0d |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
184e0d |
Date: Thu, 27 Apr 2017 15:28:41 -0400
|
|
|
184e0d |
Subject: sshtunnels: Detect listen type=none for VNC (bz 1445714)
|
|
|
184e0d |
|
|
|
184e0d |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
184e0d |
|
|
|
184e0d |
https://bugzilla.redhat.com/show_bug.cgi?id=1445714
|
|
|
184e0d |
(cherry picked from commit cd0e3a897c2fa0f7efb0149dcbb6848844fb724b)
|
|
|
184e0d |
|
|
|
184e0d |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1445714
|
|
|
184e0d |
|
|
|
184e0d |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
184e0d |
---
|
|
|
184e0d |
virtManager/sshtunnels.py | 3 +++
|
|
|
184e0d |
1 file changed, 3 insertions(+)
|
|
|
184e0d |
|
|
|
184e0d |
diff --git a/virtManager/sshtunnels.py b/virtManager/sshtunnels.py
|
|
|
184e0d |
index 62eae42e..507eb559 100644
|
|
|
184e0d |
--- a/virtManager/sshtunnels.py
|
|
|
184e0d |
+++ b/virtManager/sshtunnels.py
|
|
|
184e0d |
@@ -38,6 +38,7 @@ class ConnectionInfo(object):
|
|
|
184e0d |
self.gsocket = gdev.socket
|
|
|
184e0d |
self.gaddr = gdev.listen or "127.0.0.1"
|
|
|
184e0d |
self.gtlsport = gdev.tlsPort or None
|
|
|
184e0d |
+ self.glistentype = gdev.get_first_listen_type()
|
|
|
184e0d |
|
|
|
184e0d |
self.transport = conn.get_uri_transport()
|
|
|
184e0d |
self.connuser = conn.get_uri_username()
|
|
|
184e0d |
@@ -60,6 +61,8 @@ class ConnectionInfo(object):
|
|
|
184e0d |
return False
|
|
|
184e0d |
|
|
|
184e0d |
def _is_listen_none(self):
|
|
|
184e0d |
+ if self.glistentype == "none":
|
|
|
184e0d |
+ return True
|
|
|
184e0d |
return not (self.gsocket or self.gport or self.gtlsport)
|
|
|
184e0d |
|
|
|
184e0d |
def need_tunnel(self):
|
|
|
184e0d |
--
|
|
|
184e0d |
2.12.2
|
|
|
184e0d |
|