seconded.  Guido - it _would_ do but there are some hardcoded bits.

The attached two patches fixes that.

Adrian
-- 
Email: [EMAIL PROTECTED]  -*-  GPG key available on public key servers
Debian GNU/Linux - the maintainable distribution   -*-  www.debian.org
--- connect.py.orig	2008-11-26 09:13:53.000000000 +0000
+++ connect.py	2008-12-02 09:14:59.000000000 +0000
@@ -226,7 +226,7 @@
             elif conn == CONN_TLS:
                 uri = "xen+tls://" + host + "/"
             elif conn == CONN_SSH:
-                uri = "xen+ssh://root@" + host + "/"
+                uri = "xen+ssh://" + host + "/"
             elif conn == CONN_TCP:
                 uri = "xen+tcp://" + host + "/"
         else:
@@ -235,7 +235,7 @@
             elif conn == CONN_TLS:
                 uri = "qemu+tls://" + host + "/system"
             elif conn == CONN_SSH:
-                uri = "qemu+ssh://root@" + host + "/system"
+                uri = "qemu+ssh://" + host + "/system"
             elif conn == CONN_TCP:
                 uri = "qemu+tcp://" + host + "/system"
 
--- details.py.orig	2008-11-26 09:14:06.000000000 +0000
+++ details.py	2008-12-02 09:14:19.000000000 +0000
@@ -1059,11 +1059,10 @@
             os.close(1)
             os.dup(fds[1].fileno())
             os.dup(fds[1].fileno())
-            if not server.count(":"):
-                sshport = "22"
-            else:
+            argv = ["ssh", "ssh"]
+            if server.count(":"):
                 (server, sshport) = server.split(":")
-            argv = ["ssh", "ssh", "-p", sshport]
+                argv += ["-p", sshport]
             if username:
                 argv += ['-l', username]
             argv += [ server, "nc", vncaddr, str(vncport) ]

Reply via email to