加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
virnetsshsession-Adapt-to-change-libssh2-API.patch 1.43 KB
一键复制 编辑 原始数据 按行查看 历史
Jiabo Feng 提交于 2023-08-09 17:14 . libvirt update to version 6.2.0-59
From a2588d430c3dea3c4c259adc9d54d48891712c42 Mon Sep 17 00:00:00 2001
From: mayunlong <mayunlong6@huawei.com>
Date: Wed, 9 Aug 2023 21:11:41 +0800
Subject: [PATCH] virnetsshsession: Adapt to change libssh2 API
In one of its commits [1] libssh2 changed the 'text' member of
LIBSSH2_USERAUTH_KBDINT_PROMPT struct from 'char' to 'unsigned
char'. But we g_strdup() the member in order to fill 'prompt'
member of virConnectCredential struct. Typecast the value to
avoid warnings. Also, drop @prompt variable, as it's needless.
1: https://github.com/libssh2/libssh2/commit/83853f8aea0e2f739cacd491632eb7fd3d03ad2d
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
---
src/rpc/virnetsshsession.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
index fabdc3ef22..e073f6dbf7 100644
--- a/src/rpc/virnetsshsession.c
+++ b/src/rpc/virnetsshsession.c
@@ -230,9 +230,7 @@ virNetSSHKbIntCb(const char *name G_GNUC_UNUSED,
/* fill data structures for auth callback */
for (i = 0; i < num_prompts; i++) {
- char *prompt;
- prompt = g_strdup(prompts[i].text);
- askcred[i].prompt = prompt;
+ askcred[i].prompt = g_strdup((char *)prompts[i].text);
/* remove colon and trailing spaces from prompts, as default behavior
* of libvirt's auth callback is to add them */
--
2.41.0.windows.1
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化