mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
rpc: virnetlibsshsession: update deprecated functions
In libssh 0.9.0 functions ssh_is_server_known and ssh_write_knownhost are marked as deprecated. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1722735 Signed-off-by: Pavel Hrdina <phrdina@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
parent
1a63ef2a25
commit
e0ce339c31
@ -33,6 +33,14 @@ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
|
||||
[],
|
||||
[AC_DEFINE_UNQUOTED([ssh_get_server_publickey], [ssh_get_publickey],
|
||||
[ssh_get_publickey is deprecated and replaced by ssh_get_server_publickey.])])
|
||||
AC_CHECK_FUNC([ssh_session_is_known_server],
|
||||
[],
|
||||
[AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_known],
|
||||
[ssh_is_server_known is deprecated and replaced by ssh_session_is_known_server.])])
|
||||
AC_CHECK_FUNC([ssh_session_update_known_hosts],
|
||||
[],
|
||||
[AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_knownhost],
|
||||
[ssh_write_knownhost is deprecated and replaced by ssh_session_update_known_hosts.])])
|
||||
CFLAGS="$old_CFLAGS"
|
||||
LIBS="$old_LIBS"
|
||||
fi
|
||||
|
@ -284,7 +284,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess)
|
||||
if (sess->hostKeyVerify == VIR_NET_LIBSSH_HOSTKEY_VERIFY_IGNORE)
|
||||
return 0;
|
||||
|
||||
state = ssh_is_server_known(sess->session);
|
||||
state = ssh_session_is_known_server(sess->session);
|
||||
|
||||
switch (state) {
|
||||
case SSH_SERVER_KNOWN_OK:
|
||||
@ -378,7 +378,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess)
|
||||
|
||||
/* write the host key file, if specified */
|
||||
if (sess->knownHostsFile) {
|
||||
if (ssh_write_knownhost(sess->session) < 0) {
|
||||
if (ssh_session_update_known_hosts(sess->session) < 0) {
|
||||
errmsg = ssh_get_error(sess->session);
|
||||
virReportError(VIR_ERR_LIBSSH,
|
||||
_("failed to write known_host file '%s': %s"),
|
||||
|
Loading…
Reference in New Issue
Block a user