From nobody Thu Mar 28 10:19:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1543002786241797.1441041121511; Fri, 23 Nov 2018 11:53:06 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 07BCA76532; Fri, 23 Nov 2018 19:52:57 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E76F55C227; Fri, 23 Nov 2018 19:52:55 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id E570841FB9; Fri, 23 Nov 2018 19:52:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wANJqpvf012459 for ; Fri, 23 Nov 2018 14:52:51 -0500 Received: by smtp.corp.redhat.com (Postfix) id E761B60920; Fri, 23 Nov 2018 19:52:51 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DF36318233 for ; Fri, 23 Nov 2018 19:52:49 +0000 (UTC) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B08FD3D09 for ; Fri, 23 Nov 2018 19:52:48 +0000 (UTC) Received: by mail-qt1-f196.google.com with SMTP id p17so11560962qtl.5 for ; Fri, 23 Nov 2018 11:52:48 -0800 (PST) Received: from localhost.localdomain ([191.8.59.166]) by smtp.gmail.com with ESMTPSA id v50sm35595049qtc.7.2018.11.23.11.52.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 11:52:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=fFwZ/rVEw0rAWMTkAhFtswMWGfKU0h7oIdlAcUGk3vs=; b=r3EoIYMVgILqflKZNxSFvxNeDDFul5tpxLOS3gSv8AGfy6GiB4kviuNAA/MIOBdiCi sCj6oKt8OmmzLhNZ9DXIzHJ+2WCvjG2p7bDvI7VpPVjOAP8Z5xpVN9lt+q5txVaFg9D7 tZWVDoBnATSDDcaB47RaWcZLjUPz/ElOECFJ+/7CbmPOnIP4t3uGtKqgzDzjvXHLHlOQ gix4nb7/XJYQPcqSnVRrJN13eEA67lQO6zyDCCwBglfSW4RTmeIXz0QVk/kEN3L9Ok5G hyw5GTOQvYKgpYVBA+3GJqtE01guxXOLpKAtor9Tb8VQUHihUZxbSLO9SABxNssR+xux u6LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fFwZ/rVEw0rAWMTkAhFtswMWGfKU0h7oIdlAcUGk3vs=; b=Uc+2Q+94GbnrocMVtPsNzB1ez4fiu9eYVCWsUhyWut6g1W9JI4vwhuPLBdnI34TWZk DCIrKH6ATw22A00Ho0NkUXb5CcGoY5bmnq6dNKOioJwiqbGsvONWa9kNcnecnBJr60ZV FdnDQfPQ+XUXmjo+SAB/T3nLvbWA6yTCVMgAIHgjZ6WPi1qCc2woLo1qH5iqMIbBL7Ak jmK+dVXk+y+qsclufUKnhGnk41otIB+4dsV0U4Y9mHjYvcFp5jUR8OLt0RtD3cZCpLvA hheBWqQ7fqyEVhgqV6WHgy7YM4lTx4xr8DFR4QwjnikkXTnf4rxONuxRQNDIreqDIqD2 AWBQ== X-Gm-Message-State: AA+aEWaLy9L4VAAsM2dELuwo6jR+FWlTN8P6y3X+dfDOxB4XjF6+MYrV aGw8LyvJFCTxqQJtTMC2DnNwV6oO X-Google-Smtp-Source: AJdET5cz/gLDUSd5f9kP7NuiTDfJJL0iTC4BQDGTbk6tDogiQk07QEUXQtZhH5T2oHNKYqsUhDptbw== X-Received: by 2002:ac8:2472:: with SMTP id d47mr15928569qtd.7.1543002767716; Fri, 23 Nov 2018 11:52:47 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Sat, 24 Nov 2018 03:52:33 +0800 Message-Id: <20181123195237.15802-2-jcfaracco@gmail.com> In-Reply-To: <20181123195237.15802-1-jcfaracco@gmail.com> References: <20181123195237.15802-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 23 Nov 2018 19:52:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 23 Nov 2018 19:52:48 +0000 (UTC) for IP:'209.85.160.196' DOMAIN:'mail-qt1-f196.google.com' HELO:'mail-qt1-f196.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.108 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.196 mail-qt1-f196.google.com 209.85.160.196 mail-qt1-f196.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 1/4] m4: checking if ssh_session_is_known_server() exists. X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 23 Nov 2018 19:52:57 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit adds some checks inside libssh m4 checking to verify if ssh_session_is_known_server function is available. This new function scope replaces the old ssh_is_server_known() from libssh 0.8.0 and below versions. Another auxiliar enumerator was added to keep the compatibility with the old standard used by ssh_is_server_known() function. Signed-off-by: Julio Faracco --- m4/virt-libssh.m4 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4 index 01c3b75c72..52bd4d3639 100644 --- a/m4/virt-libssh.m4 +++ b/m4/virt-libssh.m4 @@ -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_serve= r_publickey.])]) + AC_CHECK_FUNC([ssh_session_is_known_server], + [], + [AC_DEFINE_UNQUOTED([ssh_session_is_known_server], [ssh_is_server_kn= own], + [ssh_is_server_known is deprecated and replaced by ssh_session= _is_known_server.])]) + AC_CHECK_TYPES([enum ssh_known_hosts_e], + [AC_DEFINE([HAVE_SSH_KNOWN_HOSTS_E], [1], + [Defined if enum ssh_known_hosts_e exists in libssh.h])], + [], [[#include ]]) CFLAGS=3D"$old_CFLAGS" LIBS=3D"$old_LIBS" fi --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Mar 28 10:19:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1543002796837876.9732087717771; Fri, 23 Nov 2018 11:53:16 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1C5A23082AEE; Fri, 23 Nov 2018 19:53:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DB1DD18B9D; Fri, 23 Nov 2018 19:53:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9DA0B3F7D0; Fri, 23 Nov 2018 19:53:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wANJqrJi012472 for ; Fri, 23 Nov 2018 14:52:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 05D87BA67; Fri, 23 Nov 2018 19:52:53 +0000 (UTC) Received: from mx1.redhat.com (ext-mx01.extmail.prod.ext.phx2.redhat.com [10.5.110.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F22B7383F for ; Fri, 23 Nov 2018 19:52:50 +0000 (UTC) Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0F4E57F6B3 for ; Fri, 23 Nov 2018 19:52:50 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id q70so9060610qkh.6 for ; Fri, 23 Nov 2018 11:52:50 -0800 (PST) Received: from localhost.localdomain ([191.8.59.166]) by smtp.gmail.com with ESMTPSA id v50sm35595049qtc.7.2018.11.23.11.52.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 11:52:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6ImuGxQZhxiZJfBERbgGIIP3tWmrkgfJBLkRFBWxXLw=; b=m7kDSDhTn4r8uOHTLm6KZZgbKtCnT4b3f8j9gtaOyVyAGnSJ2nE/l6y0cwAv5wFk7j rHnWVHlRozA/pIfwFnyQP/1ECSWtkkF8ASTF2OXwomeqbg+WPqCgorrFVDp5Qijxkqlv OxFA5au+TIh4Z/HmlerIy9WfNUZwSvGhKAT+EyTKHbWgfzrHOhf7imwEPhJyrQfcoNi/ 15URUNU9LH6MO92p21CT5BPyvzS0uSvDV5yatuOe+t2lMIiYRj9Ofxie2FQKmtZKW9ub rPUiI+9TKue/XCU5Lbz18T/utQ2pLGSDRBr7pmutEeZssiaJqyICZezBLqJHue7GgBDP 51Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6ImuGxQZhxiZJfBERbgGIIP3tWmrkgfJBLkRFBWxXLw=; b=TfeD5cWgWANl8HQBAjPMScFPtdoTFJiLQTLj6ZTfibWB2jLo/g1xbr1Q3CSuytFf9X AUu2xCIsdtsrdQd/7uq7bgyWQjP3vowp98Xb1XgscaSJ6hfk4b+EfByy/3p1P3M8KAdM YnKVo6WfiMzanD1pDJgJJ3pdA6EiB60IMsKbpdD/n804ZFuW0rW06wXFu6wsj0RkaJ49 X8kPShan+fklRq3Xy4UprLJf4viRewcEwrlsNDkWv3j977L61Fv/yAJ3bjOBfySnaDMc Bnuq9zleJlxLGjpzN5YZ7korUtTaO6ToMPlxuS3Ku0jpAGg88cZlcXaklq5BVF0T1u5z IqVw== X-Gm-Message-State: AA+aEWbNRiN5Zww/c7cKgw4AbiZmehDBjnZQUl24/s+RWo9G45VUVQDd R/dIuXSq1wvHlG7fWfBgJHBXi0Hb X-Google-Smtp-Source: AFSGD/VKOihhFhJ1ngsG3cYHy7pJIGLXUBaRcGK5jjkVcdUruns25mTmWBc4yU5vbTd0Zk2uklatfw== X-Received: by 2002:ae9:ed51:: with SMTP id c78mr15014655qkg.85.1543002769090; Fri, 23 Nov 2018 11:52:49 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Sat, 24 Nov 2018 03:52:34 +0800 Message-Id: <20181123195237.15802-3-jcfaracco@gmail.com> In-Reply-To: <20181123195237.15802-1-jcfaracco@gmail.com> References: <20181123195237.15802-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 23 Nov 2018 19:52:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 23 Nov 2018 19:52:50 +0000 (UTC) for IP:'209.85.222.193' DOMAIN:'mail-qk1-f193.google.com' HELO:'mail-qk1-f193.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.111 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_PASS) 209.85.222.193 mail-qk1-f193.google.com 209.85.222.193 mail-qk1-f193.google.com X-Scanned-By: MIMEDefang 2.83 on 10.5.110.25 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 2/4] rpc: replacing ssh_is_server_known() by ssh_session_is_known_server(). X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 23 Nov 2018 19:53:14 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" After version 0.8.0, libssh deprecated the function scope ssh_is_server_known() and moved to ssh_session_is_known_server(). So, libvirt is failing to compile using this new function name. Signed-off-by: Julio Faracco --- src/rpc/virnetlibsshsession.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 7c5f158f4d..eb6d6843a2 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -80,6 +80,22 @@ struct _virNetLibsshAuthMethod { int tries; }; =20 +#ifndef HAVE_SSH_KNOWN_HOSTS_E +/* This is an auxiliar enum to help libssh migration to version 0.8.0 + * or higher. This enum associates the enumerator ssh_server_known_e + * with new ssh_known_hosts_e enum. In other words, it can be removed + * in the future. ERROR was moved from -1 to -2 and NOT_FOUND from 4 + * to -1. */ +enum _vir_ssh_known_hosts_e { + SSH_KNOWN_HOSTS_ERROR =3D SSH_SERVER_ERROR, + SSH_KNOWN_HOSTS_UNKNOWN =3D SSH_SERVER_NOT_KNOWN, + SSH_KNOWN_HOSTS_OK, + SSH_KNOWN_HOSTS_CHANGED, + SSH_KNOWN_HOSTS_OTHER, + SSH_KNOWN_HOSTS_NOT_FOUND, +}; +#endif + struct _virNetLibsshSession { virObjectLockable parent; virNetLibsshSessionState state; --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Mar 28 10:19:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1543002795314875.1178459289756; Fri, 23 Nov 2018 11:53:15 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2173530842AB; Fri, 23 Nov 2018 19:53:14 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DEB7BD1E1; Fri, 23 Nov 2018 19:53:13 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 9AFFF3F7CD; Fri, 23 Nov 2018 19:53:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wANJqqTa012464 for ; Fri, 23 Nov 2018 14:52:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id AB58A60920; Fri, 23 Nov 2018 19:52:52 +0000 (UTC) Received: from mx1.redhat.com (ext-mx05.extmail.prod.ext.phx2.redhat.com [10.5.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A38CC614DB for ; Fri, 23 Nov 2018 19:52:52 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89B3E168F for ; Fri, 23 Nov 2018 19:52:51 +0000 (UTC) Received: by mail-qt1-f195.google.com with SMTP id y20so11559137qtm.13 for ; Fri, 23 Nov 2018 11:52:51 -0800 (PST) Received: from localhost.localdomain ([191.8.59.166]) by smtp.gmail.com with ESMTPSA id v50sm35595049qtc.7.2018.11.23.11.52.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 11:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EosySOXbYBuqo9KYz+4laj3xCqyF9s4H3wxnNu6JiCo=; b=jNjJTi8Jg2EIjnIPIV+VQCzQaJqQIcXnohsAsfQQy8xBjNdXpqOGQlqbzO3HDj7E/b yKNjlEcqfecvqmnz6S/QF/yhJJ12TsnabmWvU2HiVD0J3ol1k2HqiGz7UHXR4/stdjxa 0B9uiMCa7HyiM6VKGFF+wizZuTjNeqvPedDrumW3bFskJRWu4rQRNkDxcAM/4afa5MHa bUDOnG6XrHY5qvOdouGaQ84ay67qAm3wadHqCN6XL6WbFyTW5qTa3nzb14qz2jd35A62 V1omPwK/MSvheEWfShh3mMAh+acAjM/S7Mr7iP+qV0Ha9iDQdfZBkZeaoN0ij7q69kJo /i6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EosySOXbYBuqo9KYz+4laj3xCqyF9s4H3wxnNu6JiCo=; b=qMe+R6NX8spqoJPhEn7hN/GurAMXPt/WJ79PzZAbRQ6RjOasYHmpqsIfqrgAJ2XWqf 3hiD6kyw0JlfRIwTZXab0O/iSMg9qN2k+VfVjVTZkJ3QxFgv2QB6Yq0OW9yIber0OitM CpvsJtmRleGrSSBfp9SWj8hNKLuSPVA8oPEwGj+a392lC+zp7ztHetgR33QdmWq6JI1Q QUdi0ohxCUrurmsVqSWYgRyiCPuJ6e85ThrFdg4gKcrcL6LEgkwOR6CcIwl9Wd3s7x0t FkHjYQtnFk8bO32pHVbKXnuWNJg0EEOA278kg6TgpXYBP6v84UaxgXZdg152D8kKN0SI PohA== X-Gm-Message-State: AGRZ1gKJD8uWUz3yOZJ5oFKLC0G2n9adx6Af00EjuMcOwDDncJd1VLIZ xpihLR7UApQdM1Wpu6pp3nrbeovY X-Google-Smtp-Source: AJdET5cFTCej9xMLJb2Fzgv/v1mAqt4pi8PKlPUxYUWoStCc796EfVmdtbfiQ/h+OlPR1AmP6L3vOQ== X-Received: by 2002:aed:25a6:: with SMTP id x35mr15764162qtc.228.1543002770505; Fri, 23 Nov 2018 11:52:50 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Sat, 24 Nov 2018 03:52:35 +0800 Message-Id: <20181123195237.15802-4-jcfaracco@gmail.com> In-Reply-To: <20181123195237.15802-1-jcfaracco@gmail.com> References: <20181123195237.15802-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 23 Nov 2018 19:52:51 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 23 Nov 2018 19:52:51 +0000 (UTC) for IP:'209.85.160.195' DOMAIN:'mail-qt1-f195.google.com' HELO:'mail-qt1-f195.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.108 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.195 mail-qt1-f195.google.com 209.85.160.195 mail-qt1-f195.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.29 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 3/4] m4: checking if ssh_session_update_known_hosts() exists. X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Fri, 23 Nov 2018 19:53:14 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This commit adds some checks inside libssh m4 checking to verify if ssh_session_update_known_hosts function is available. This new function scope replaces the old ssh_write_knownhost() from libssh 0.8.0 and below versions. Signed-off-by: Julio Faracco --- m4/virt-libssh.m4 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/m4/virt-libssh.m4 b/m4/virt-libssh.m4 index 52bd4d3639..f6d307f8d1 100644 --- a/m4/virt-libssh.m4 +++ b/m4/virt-libssh.m4 @@ -41,6 +41,10 @@ AC_DEFUN([LIBVIRT_CHECK_LIBSSH],[ [AC_DEFINE([HAVE_SSH_KNOWN_HOSTS_E], [1], [Defined if enum ssh_known_hosts_e exists in libssh.h])], [], [[#include ]]) + AC_CHECK_FUNC([ssh_session_update_known_hosts], + [], + [AC_DEFINE_UNQUOTED([ssh_session_update_known_hosts], [ssh_write_kno= wnhost], + [ssh_write_knownhost is deprecated and replaced by ssh_session= _update_known_hosts.])]) CFLAGS=3D"$old_CFLAGS" LIBS=3D"$old_LIBS" fi --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Thu Mar 28 10:19:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1543002799552452.70033229074784; Fri, 23 Nov 2018 11:53:19 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 020FC308FB86; Fri, 23 Nov 2018 19:53:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C0BD91001F53; Fri, 23 Nov 2018 19:53:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7EA793F602; Fri, 23 Nov 2018 19:53:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id wANJqu55012494 for ; Fri, 23 Nov 2018 14:52:56 -0500 Received: by smtp.corp.redhat.com (Postfix) id E82F44536; Fri, 23 Nov 2018 19:52:56 +0000 (UTC) Received: from mx1.redhat.com (ext-mx10.extmail.prod.ext.phx2.redhat.com [10.5.110.39]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E057E452B for ; Fri, 23 Nov 2018 19:52:54 +0000 (UTC) Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 01DB9753B1 for ; Fri, 23 Nov 2018 19:52:53 +0000 (UTC) Received: by mail-qt1-f194.google.com with SMTP id t13so11563109qtn.3 for ; Fri, 23 Nov 2018 11:52:52 -0800 (PST) Received: from localhost.localdomain ([191.8.59.166]) by smtp.gmail.com with ESMTPSA id v50sm35595049qtc.7.2018.11.23.11.52.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Nov 2018 11:52:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=NhrOReXyQxTnFoPyUKqRG0s1aTx4NJYGJLuiwLrb54I=; b=GekJ+F3i3w9FKGCu6Ho/reQmsHaFTEh5Hh8DAVnCHVTDPbtAfygNrRux8dLmPFhWXC ljFByCFVG5apdD3ZLoFdcI8wIC7xqLeGhHLT62KXiNa+D99xhxgWiQ2lJwC9BW2tS3mc rBYJcpLsYef1PnACik7n5cWgjQvJeEt7BsQ0rvH74Y7WZ+0yxwtrLBDhrB0zGNkYv7kh 73vsgDqdZpVjbHzH681rrZq1uY2MutWROiHrDScNrVp1ab0QZlVMTv0spY0hvAE8QyBa yXBAUg0GH3VhwkyXtg9q7tY5iETiXNqetn+bwAQrBv7SCP+83ttNz+KLsxkgKXCsRWt0 Z97Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NhrOReXyQxTnFoPyUKqRG0s1aTx4NJYGJLuiwLrb54I=; b=e8ekXIGegHvktJEh32ee3sEKZ/Xcxf2rRUXxvzZ1f22/AL1ozOZUtp50DOyHx5bMst doSdXxAKOqqd4ID5Eh9WL9uf0f3ymnDQP7upJVpgqtc2zO6fgCr9HXyBdnlVktam3CU1 KPZ5ZZC2y74eQlsfRC2VZbUo3gCQZQmVIXg474mBCiA4vLQ6scz2mLzcJYpHDjqwp/J6 dlXoP6Q4hXvtGcq8UZTpWv7A4k3HUzRS/iM3zzZ9fkCXiyilg1zA72GNIxaOoJOo26WS fFmtokZ3WbxElOHeKMs2qYfaRKAB1laLrBP0mpVlD+HsCUaAqtNnsPWF6fztzvjNngIM tcNQ== X-Gm-Message-State: AA+aEWaeOKDz6Ym4Q1UDaQUVQzh7SXYXGrNIpSNt97Cor0nb7qN/66rl IPUylxIoye2m+w6MGJjhwaMXlYgt X-Google-Smtp-Source: AFSGD/WTnDKhIFH7dSJSsaM7JRjdtpNRjTYSAXTPfAhkpDXg0w8EKyS+YDWx37sRgbF1uwLBvIjszQ== X-Received: by 2002:a0c:b8ac:: with SMTP id y44mr16014183qvf.76.1543002772006; Fri, 23 Nov 2018 11:52:52 -0800 (PST) From: Julio Faracco To: libvir-list@redhat.com Date: Sat, 24 Nov 2018 03:52:36 +0800 Message-Id: <20181123195237.15802-5-jcfaracco@gmail.com> In-Reply-To: <20181123195237.15802-1-jcfaracco@gmail.com> References: <20181123195237.15802-1-jcfaracco@gmail.com> MIME-Version: 1.0 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 23 Nov 2018 19:52:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 23 Nov 2018 19:52:53 +0000 (UTC) for IP:'209.85.160.194' DOMAIN:'mail-qt1-f194.google.com' HELO:'mail-qt1-f194.google.com' FROM:'jcfaracco@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.108 (DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 209.85.160.194 mail-qt1-f194.google.com 209.85.160.194 mail-qt1-f194.google.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.39 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH v3 4/4] rpc: replacing ssh_write_knownhost() by ssh_session_update_known_hosts(). X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 23 Nov 2018 19:53:18 +0000 (UTC) X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" After version 0.8.0, libssh deprecated the function scope ssh_write_knownhost() and moved to ssh_session_update_known_hosts(). So, libvirt is failing to compile using this new function name. Signed-off-by: Julio Faracco --- src/rpc/virnetlibsshsession.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index eb6d6843a2..5a7ca04dec 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -397,7 +397,7 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) =20 /* 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 =3D ssh_get_error(sess->session); virReportError(VIR_ERR_LIBSSH, _("failed to write known_host file '%s': %s= "), --=20 2.19.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list