External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

virNetLibsshSessionAuthAddPrivKeyAuth: Drop 'password' argument

Browse Source 
The only caller doesn't actually populate it. Remove it to simplify
internals.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Peter Krempa 2022-12-08 13:50:16 +01:00
parent 3f4f0ef47d
commit bf5f65fead
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/rpc/virnetlibsshsession.c
View File

@ -988,8 +988,7 @@ virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess)
int int
virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess, virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess,
const char *keyfile, const char *keyfile)
const char *password)
{ {
virNetLibsshAuthMethod *auth; virNetLibsshAuthMethod *auth;
@ -1006,7 +1005,6 @@ virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess,
return -1; return -1;
} }
auth->password = g_strdup(password);
auth->filename = g_strdup(keyfile); auth->filename = g_strdup(keyfile);
auth->method = VIR_NET_LIBSSH_AUTH_PRIVKEY; auth->method = VIR_NET_LIBSSH_AUTH_PRIVKEY;
auth->ssh_flags = SSH_AUTH_METHOD_PUBLICKEY; auth->ssh_flags = SSH_AUTH_METHOD_PUBLICKEY;

3
src/rpc/virnetlibsshsession.h
View File

@ -46,8 +46,7 @@ int virNetLibsshSessionAuthAddPasswordAuth(virNetLibsshSession *sess,
int virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess); int virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess);
int virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess, int virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess,
const char *keyfile, const char *keyfile);
const char *password);
int virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSession *sess, int virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSession *sess,
int tries); int tries);

4
src/rpc/virnetsocket.c
View File

@ -1080,9 +1080,7 @@ virNetSocketNewConnectLibssh(const char *host,
} else if (STRCASEEQ(authMethod, "password")) { } else if (STRCASEEQ(authMethod, "password")) {
ret = virNetLibsshSessionAuthAddPasswordAuth(sess, uri); ret = virNetLibsshSessionAuthAddPasswordAuth(sess, uri);
} else if (STRCASEEQ(authMethod, "privkey")) { } else if (STRCASEEQ(authMethod, "privkey")) {
ret = virNetLibsshSessionAuthAddPrivKeyAuth(sess, ret = virNetLibsshSessionAuthAddPrivKeyAuth(sess, privkey);
privkey,
NULL);
} else if (STRCASEEQ(authMethod, "agent")) { } else if (STRCASEEQ(authMethod, "agent")) {
ret = virNetLibsshSessionAuthAddAgentAuth(sess); ret = virNetLibsshSessionAuthAddAgentAuth(sess);
} else { } else {