[Pkg-libvirt-commits] [SCM] VirtViewer Debian packaging branch, master, updated. debian/0.5.5+really0.5.4-1

[Guido Günther]

The following commit has been merged in the master branch:
commit d0817dddb1df22425a1f7f4c067ab740c2f9ab3a
Author: Guido Günther <agx at sigxcpu.org>
Date:   Thu Apr 18 08:16:31 2013 +0200

    Fix ssh access if no listen tag is set on the domain
    
    Thanks: Attila Kinali
    Closes: #696435

diff --git a/debian/patches/0003-Fix-ssh-access-if-no-listen-tag-is-set-on-the-domain.patch b/debian/patches/0003-Fix-ssh-access-if-no-listen-tag-is-set-on-the-domain.patch
new file mode 100644
index 0000000..0365ed9
--- /dev/null
+++ b/debian/patches/0003-Fix-ssh-access-if-no-listen-tag-is-set-on-the-domain.patch
@@ -0,0 +1,33 @@
+From: Attila Kinali <attila at kinali.ch>
+Date: Thu, 18 Apr 2013 08:15:16 +0200
+Subject: Fix ssh access if no listen tag is set on the domain
+
+Closes: #696435
+---
+ src/virt-viewer.c |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/src/virt-viewer.c b/src/virt-viewer.c
+index 572e9e6..8ca9c63 100644
+--- a/src/virt-viewer.c
++++ b/src/virt-viewer.c
+@@ -354,10 +354,17 @@ virt_viewer_extract_connect_info(VirtViewer *self,
+     if (!ghost ||
+         (strcmp(ghost, "0.0.0.0") == 0 ||
+          strcmp(ghost, "::") == 0)) {
++	 char *replace = NULL;
++	if(strcmp(transport, "ssh") == 0)
++	{
++		replace = "localhost";
++	} else {
++		replace = host;
++	}
+         DEBUG_LOG("Guest graphics listen '%s' is NULL or a wildcard, replacing with '%s'",
+-                  ghost ? ghost : "", host);
++                  ghost ? ghost : "", replace);
+         g_free(ghost);
+-        ghost = g_strdup(host);
++        ghost = g_strdup(replace);
+     }
+ 
+     virt_viewer_app_set_connect_info(app, host, ghost, gport, gtlsport,transport, unixsock, user, port, NULL);
diff --git a/debian/patches/series b/debian/patches/series
index c39d1b2..ae461c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Fail-if-opening-the-connection-fails.patch
 0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
+0003-Fix-ssh-access-if-no-listen-tag-is-set-on-the-domain.patch

-- 
VirtViewer Debian packaging