1
From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
2
Date: Fri, 30 Jan 2009 22:01:15 +0100
3
Subject: [PATCH] Don't hardcode ssh port
5
based on a patch by Adrian Bridgett.
9
src/remote_internal.c | 14 +++++++-------
10
1 files changed, 7 insertions(+), 7 deletions(-)
12
diff --git a/src/remote_internal.c b/src/remote_internal.c
13
index f8740af..dbd9673 100644
14
--- a/src/remote_internal.c
15
+++ b/src/remote_internal.c
16
@@ -387,9 +387,6 @@ doRemoteOpen (virConnectPtr conn,
17
} else if (transport == trans_tcp) {
18
port = strdup (LIBVIRTD_TCP_PORT);
19
if (!port) goto out_of_memory;
20
- } else if (transport == trans_ssh) {
21
- port = strdup ("22");
22
- if (!port) goto out_of_memory;
24
port = NULL; /* Port not used for unix, ext. */
26
@@ -673,24 +670,27 @@ doRemoteOpen (virConnectPtr conn,
33
if (username) nr_args += 2; /* For -l username */
34
if (no_tty) nr_args += 5; /* For -T -o BatchMode=yes -e none */
35
+ if (port) nr_args += 2; /* For -p port */
37
command = command ? command : strdup ("ssh");
41
// Generate the final command argv[] array.
42
- // ssh -p $port [-l $username] $hostname $netcat -U $sockname [NULL]
43
+ // ssh [-p $port] [-l $username] $hostname $netcat -U $sockname [NULL]
44
if (VIR_ALLOC_N(cmd_argv, nr_args) < 0)
48
cmd_argv[j++] = strdup (command);
49
- cmd_argv[j++] = strdup ("-p");
50
- cmd_argv[j++] = strdup (port);
52
+ cmd_argv[j++] = strdup ("-p");
53
+ cmd_argv[j++] = strdup (port);
56
cmd_argv[j++] = strdup ("-l");
57
cmd_argv[j++] = strdup (username);