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 4a5bd5b6798c9a66f2ad80fbfe7cd87e9e2d75cd..a5b820d7bf2d9b108eedf5da1a2baceb128ce641 100644 (file)
--- 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 bb8cbe3cb53564f205f664cf1b55190982f49f81..b1273fee8c40a66ec9068f53dc180b598f20d1c4 100644 (file)
--- 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 0005de46f319009c0acf0e811e86035c332d5e13..6fdc370083244b3aca14e7bae6ea3422157a4534 100644 (file)
--- 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,