From a2588d430c3dea3c4c259adc9d54d48891712c42 Mon Sep 17 00:00:00 2001 From: mayunlong 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 Reviewed-by: Peter Krempa --- 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