|
 |
c313de |
From aa46a438d03839963badb7bdd2904a71f0662942 Mon Sep 17 00:00:00 2001
|
|
|
c313de |
Message-Id: <aa46a438d03839963badb7bdd2904a71f0662942@dist-git>
|
|
|
c313de |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
Date: Fri, 21 Jun 2019 09:30:36 +0200
|
|
|
c313de |
Subject: [PATCH] rpc: virnetlibsshsession: update deprecated functions
|
|
|
c313de |
|
|
|
c313de |
In libssh 0.9.0 functions ssh_is_server_known and ssh_write_knownhost
|
|
|
c313de |
are marked as deprecated.
|
|
|
c313de |
|
|
|
c313de |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1722735
|
|
|
c313de |
|
|
|
c313de |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
c313de |
Message-Id: <e6b648f51b2d3a2714d7e28249dd390f707994b1.1561102197.git.phrdina@redhat.com>
|
|
|
c313de |
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c313de |
---
|
|
|
c313de |
m4/virt-libssh.m4 | 8 ++++++++
|
|
|
c313de |
src/rpc/virnetlibsshsession.c | 4 ++--
|
|
|
c313de |
2 files changed, 10 insertions(+), 2 deletions(-)
|
|
|
c313de |
|
|
|
c313de |
diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4
|
|
|
c313de |
index 01c3b75c72..132447da16 100644
|
|
|
c313de |
--- a/m4/virt-libssh.m4
|
|
|
c313de |
+++ b/m4/virt-libssh.m4
|
|
|
c313de |
@@ -33,6 +33,14 @@ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[
|
|
|
c313de |
[],
|
|
|
c313de |
[AC_DEFINE_UNQUOTED([ssh_get_server_publickey], [ssh_get_publickey],
|
|
|
c313de |
[ssh_get_publickey is deprecated and replaced by ssh_get_server_publickey.])])
|
|
|
c313de |
+ AC_CHECK_FUNC([ssh_session_is_known_server],
|
|
|
c313de |
+ [],
|
|
|
c313de |
+ [AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_known],
|
|
|
c313de |
+ [ssh_is_server_known is deprecated and replaced by ssh_session_is_known_server.])])
|
|
|
c313de |
+ AC_CHECK_FUNC([ssh_session_update_known_hosts],
|
|
|
c313de |
+ [],
|
|
|
c313de |
+ [AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_knownhost],
|
|
|
c313de |
+ [ssh_write_knownhost is deprecated and replaced by ssh_session_update_known_hosts.])])
|
|
|
c313de |
CFLAGS="$old_CFLAGS"
|
|
|
c313de |
LIBS="$old_LIBS"
|
|
|
c313de |
fi
|
|
|
c313de |
diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c
|
|
|
c313de |
index df819f6169..7bc2bd33ee 100644
|
|
|
c313de |
--- a/src/rpc/virnetlibsshsession.c
|
|
|
c313de |
+++ b/src/rpc/virnetlibsshsession.c
|
|
|
c313de |
@@ -287,7 +287,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess)
|
|
|
c313de |
if (sess->hostKeyVerify == VIR_NET_LIBSSH_HOSTKEY_VERIFY_IGNORE)
|
|
|
c313de |
return 0;
|
|
|
c313de |
|
|
|
c313de |
- state = ssh_is_server_known(sess->session);
|
|
|
c313de |
+ state = ssh_session_is_known_server(sess->session);
|
|
|
c313de |
|
|
|
c313de |
switch (state) {
|
|
|
c313de |
case SSH_SERVER_KNOWN_OK:
|
|
|
c313de |
@@ -381,7 +381,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess)
|
|
|
c313de |
|
|
|
c313de |
/* write the host key file, if specified */
|
|
|
c313de |
if (sess->knownHostsFile) {
|
|
|
c313de |
- if (ssh_write_knownhost(sess->session) < 0) {
|
|
|
c313de |
+ if (ssh_session_update_known_hosts(sess->session) < 0) {
|
|
|
c313de |
errmsg = ssh_get_error(sess->session);
|
|
|
c313de |
virReportError(VIR_ERR_LIBSSH,
|
|
|
c313de |
_("failed to write known_host file '%s': %s"),
|
|
|
c313de |
--
|
|
|
c313de |
2.22.0
|
|
|
c313de |
|