virNetSSHSessionAuthAddPrivKeyAuth: Remove unused 'password' argument

The only caller doesn't pass the password. Remove the argument.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 8fbc69d51c78fd86696c78bf90c8c2a2fd450e56..b9b7328f871ef13178bf2703b22af764c9efd5b8 100644 (file)
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -954,8 +954,7 @@ virNetSocketNewConnectLibSSH2(const char *host,
         } else if (STRCASEEQ(authMethod, "privkey")) {
             ret = virNetSSHSessionAuthAddPrivKeyAuth(sess,
                                                      username,
-                                                     privkey,
-                                                     NULL);
+                                                     privkey);
         } else if (STRCASEEQ(authMethod, "agent")) {
             ret = virNetSSHSessionAuthAddAgentAuth(sess, username);
         } else {

diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index 485318d09b5ec07661caca33b0a5624ca7fe122e..08f246be610b2e30bfa5e13d41ba177ca604294c 100644 (file)
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -1056,13 +1056,11 @@ virNetSSHSessionAuthAddAgentAuth(virNetSSHSession *sess,
 int
 virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess,
                                    const char *username,
-                                   const char *keyfile,
-                                   const char *password)
+                                   const char *keyfile)
 {
     virNetSSHAuthMethod *auth;
 
     char *user = NULL;
-    char *pass = NULL;
     char *file = NULL;
 
     if (!username || !keyfile) {
@@ -1076,13 +1074,11 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess,
 
     user = g_strdup(username);
     file = g_strdup(keyfile);
-    pass = g_strdup(password);
 
     if (!(auth = virNetSSHSessionAuthMethodNew(sess)))
         goto error;
 
     auth->username = user;
-    auth->password = pass;
     auth->filename = file;
     auth->method = VIR_NET_SSH_AUTH_PRIVKEY;
 
@@ -1091,7 +1087,6 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess,
 
  error:
     VIR_FREE(user);
-    VIR_FREE(pass);
     VIR_FREE(file);
     virObjectUnlock(sess);
     return -1;

diff --git a/src/rpc/virnetsshsession.h b/src/rpc/virnetsshsession.h
index 7a056df37fc42cdfb844d8ed5f2b051cf18ff98d..8d6c99c5477789fb3f31aa6e5459074cb1105ac7 100644 (file)
--- a/src/rpc/virnetsshsession.h
+++ b/src/rpc/virnetsshsession.h
@@ -56,8 +56,7 @@ int virNetSSHSessionAuthAddAgentAuth(virNetSSHSession *sess,
 
 int virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess,
                                        const char *username,
-                                       const char *keyfile,
-                                       const char *password);
+                                       const char *keyfile);
 
 int virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSession *sess,
                                         const char *username,