From: Daniel P. Berrangé <berrange@redhat.com>
Date: Tue, 21 Jul 2020 11:15:57 +0000 (+0100)
Subject: remote: push logic for default netcat binary into common helper
X-Git-Tag: v6.8.0-rc1~229
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5cd80b04d918c001587ba262cc4e44cd7a16b198;p=thirdparty%2Flibvirt.git

remote: push logic for default netcat binary into common helper

We don't want to repeat the choice of default netcat binary setting in
three different places. This will also make it possible to do better
error reporting in the helper.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 8c055e0347..5755eecf54 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1225,7 +1225,7 @@ doRemoteOpen(virConnectPtr conn,
                                                 username,
                                                 !tty,
                                                 !verify,
-                                                netcat ? netcat : "nc",
+                                                netcat,
                                                 keyfile,
                                                 sockname)))
             goto failed;
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index 9c76eaca5e..bb8cbe3cb5 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -419,6 +419,9 @@ virNetClientSSHHelperCommand(const char *netcatPath,
 {
     g_autofree char *netcatPathSafe = virNetClientDoubleEscapeShell(netcatPath);
 
+    if (!netcatPath)
+        netcatPath = "nc";
+
     return g_strdup_printf(
         "sh -c "
         "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then "
@@ -505,7 +508,6 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
     DEFAULT_VALUE(host, "localhost");
     DEFAULT_VALUE(port, "22");
     DEFAULT_VALUE(username, "root");
-    DEFAULT_VALUE(netcatPath, "nc");
     DEFAULT_VALUE(knownHostsVerify, "normal");
 
     command = virNetClientSSHHelperCommand(netcatPath, socketPath);
@@ -566,7 +568,6 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
     DEFAULT_VALUE(host, "localhost");
     DEFAULT_VALUE(port, "22");
     DEFAULT_VALUE(username, "root");
-    DEFAULT_VALUE(netcatPath, "nc");
     DEFAULT_VALUE(knownHostsVerify, "normal");
 
     command = virNetClientSSHHelperCommand(netcatPath, socketPath);