From: Daniel P. Berrangé <berrange@redhat.com>
Date: Wed, 8 Jul 2020 12:05:38 +0000 (+0100)
Subject: rpc: switch order of args in virNetClientNewSSH
X-Git-Tag: v6.8.0-rc1~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e4143c8510282a3070fe737af4b9ddb5b16fd58;p=thirdparty%2Flibvirt.git

rpc: switch order of args in virNetClientNewSSH

Switch keyfile and netcat parameters, since the netcat path and
socket path are a logical pair that belong together. This patches
the other constructors.

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

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 4a5bd5b679..a5b820d7bf 100644
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1009,8 +1009,8 @@ doRemoteOpen(virConnectPtr conn,
                                                 username,
                                                 !tty,
                                                 !verify,
-                                                netcat,
                                                 keyfile,
+                                                netcat,
                                                 sockname)))
             goto failed;
 
diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index bb8cbe3cb5..b1273fee8c 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -444,8 +444,8 @@ virNetClientPtr virNetClientNewSSH(const char *nodename,
                                    const char *username,
                                    bool noTTY,
                                    bool noVerify,
-                                   const char *netcatPath,
                                    const char *keyfile,
+                                   const char *netcatPath,
                                    const char *socketPath)
 {
     virNetSocketPtr sock;
diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h
index 0005de46f3..6fdc370083 100644
--- a/src/rpc/virnetclient.h
+++ b/src/rpc/virnetclient.h
@@ -48,9 +48,9 @@ virNetClientPtr virNetClientNewSSH(const char *nodename,
                                    const char *username,
                                    bool noTTY,
                                    bool noVerify,
-                                   const char *netcat,
                                    const char *keyfile,
-                                   const char *path);
+                                   const char *netcat,
+                                   const char *socketPath);
 
 virNetClientPtr virNetClientNewLibSSH2(const char *host,
                                        const char *port,