1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
diff -wbBur libvirt-0.10.0.org/src/qemu/qemu_migration.c libvirt-0.10.0/src/qemu/qemu_migration.c
--- libvirt-0.10.0.org/src/qemu/qemu_migration.c 2012-08-27 06:12:21.000000000 +0400
+++ libvirt-0.10.0/src/qemu/qemu_migration.c 2012-08-29 13:36:23.000000000 +0400
@@ -1910,7 +1910,7 @@
spec->dest.unix_socket.file);
} else {
const char *args[] = {
- "nc", "-U", spec->dest.unix_socket.file, NULL
+ "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL
};
ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args);
}
diff -wbBur libvirt-0.10.0.org/src/remote/remote_driver.c libvirt-0.10.0/src/remote/remote_driver.c
--- libvirt-0.10.0.org/src/remote/remote_driver.c 2012-08-27 06:12:21.000000000 +0400
+++ libvirt-0.10.0/src/remote/remote_driver.c 2012-08-29 13:36:32.000000000 +0400
@@ -693,7 +693,7 @@
username,
!tty,
!verify,
- netcat ? netcat : "nc",
+ netcat ? netcat : "nc.openbsd",
keyfile,
sockname)))
goto failed;
diff -wbBur libvirt-0.10.0.org/src/rpc/virnetclient.c libvirt-0.10.0/src/rpc/virnetclient.c
--- libvirt-0.10.0.org/src/rpc/virnetclient.c 2012-08-28 07:44:50.000000000 +0400
+++ libvirt-0.10.0/src/rpc/virnetclient.c 2012-08-29 13:36:38.000000000 +0400
@@ -469,7 +469,7 @@
DEFAULT_VALUE(host, "localhost");
DEFAULT_VALUE(port, "22");
DEFAULT_VALUE(username, "root");
- DEFAULT_VALUE(netcatPath, "nc");
+ DEFAULT_VALUE(netcatPath, "nc.openbsd");
DEFAULT_VALUE(knownHostsVerify, "normal");
virBufferEscapeShell(&buf, netcatPath);
diff -wbBur libvirt-0.10.0.org/src/rpc/virnetsocket.c libvirt-0.10.0/src/rpc/virnetsocket.c
--- libvirt-0.10.0.org/src/rpc/virnetsocket.c 2012-08-22 14:00:59.000000000 +0400
+++ libvirt-0.10.0/src/rpc/virnetsocket.c 2012-08-29 13:36:44.000000000 +0400
@@ -698,7 +698,7 @@
virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL);
if (!netcat)
- netcat = "nc";
+ netcat = "nc.openbsd";
virCommandAddArgList(cmd, nodename, "sh", "-c", NULL);
diff -wbBur libvirt-0.10.0.org/tests/virnetsockettest.c libvirt-0.10.0/tests/virnetsockettest.c
--- libvirt-0.10.0.org/tests/virnetsockettest.c 2012-08-10 06:26:04.000000000 +0400
+++ libvirt-0.10.0/tests/virnetsockettest.c 2012-08-29 13:36:53.000000000 +0400
@@ -593,7 +593,7 @@
struct testSSHData sshData7 = {
.nodename = "somehost",
- .netcat = "nc -4",
+ .netcat = "nc.openbsd -4",
.path = "/tmp/socket",
.expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
"ARG=-q0;"
|
