From nobody Sun Feb 8 23:41:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571753054; cv=none; d=zoho.com; s=zohoarc; b=HVNoHJJ2x6noY7gOc0GsKhtxKOyKQ2KgEkUfYMxru3oQmNhmHeVj7L5ojqf7E1UoDwO2HxbA5IA+hQ+AxTHvrzVkwWW7Q2gI+vGM/oCdJpcONnTq8mBhW1l08OpVzXuRNi83rSKZSecKQANHDYAZiKXr15gK/mLfJZ8NzsdzIHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571753054; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3mlMWHRUouNgatYaDlQG91sv8D3+shUUPcoK0ANCtrc=; b=XFghegFJWwK0YQJCBGgcA4lWHTYcEAGJ7TaXF+ka8DgO21FQjOydTKKRcPSaNmzMVkO9QXehB9u67fVGatsEt10E/vRFCGJZwBXq9sXoQ+fcF7Qi9VkkmCYjS45kMsiQ0rDGK8bp8GAUmFcAse61gnTblqnbSedvQT7+jlrs9Ys= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1571753054156918.749491679285; Tue, 22 Oct 2019 07:04:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-331-dKqNkFc-Nii-WQRJ4RB0Rg-1; Tue, 22 Oct 2019 10:01:23 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1942B801E6F; Tue, 22 Oct 2019 14:01:18 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D4BFD5DE5B; Tue, 22 Oct 2019 14:01: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 60153180BA99; Tue, 22 Oct 2019 14:01:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9ME0pYn002761 for ; Tue, 22 Oct 2019 10:00:51 -0400 Received: by smtp.corp.redhat.com (Postfix) id B4D0C6012D; Tue, 22 Oct 2019 14:00:51 +0000 (UTC) Received: from moe.redhat.com (unknown [10.43.2.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C48D6012C for ; Tue, 22 Oct 2019 14:00:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1571753053; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=3mlMWHRUouNgatYaDlQG91sv8D3+shUUPcoK0ANCtrc=; b=LnK1B+pMbZ374bSuU1LATQvgIjqtfFplczzm7M+ashLjv1nLRTtkw5DlR3JmjaAFiF3vGd ZacodJGnFYdlEbNtb52s8KHAP63R5qxkE5mF4BWXfkwfQcznlYYitNt4kaIKoOmkNkxogh yH9h0qL+VDC0RVqDvUGL1vn9fe+nG8I= From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 22 Oct 2019 15:57:59 +0200 Message-Id: <3394f08b50913eeaf8bca0bd908b16fe2417a0c7.1571752582.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 55/75] rpc: Use g_strdup_printf() instead of virAsprintf() 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: , 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-MC-Unique: dKqNkFc-Nii-WQRJ4RB0Rg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Michal Privoznik --- src/rpc/virnetclient.c | 12 ++++++------ src/rpc/virnetlibsshsession.c | 8 ++++---- src/rpc/virnetsocket.c | 2 +- src/rpc/virnetsshsession.c | 11 ++++++----- src/rpc/virnettlscontext.c | 26 +++++++++++++------------- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index a423f4db2f..47a17d30f7 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -343,7 +343,7 @@ virNetClientCheckKeyExists(const char *homedir, { char *path; =20 - virAsprintf(&path, "%s/.ssh/%s", homedir, name); + path =3D g_strdup_printf("%s/.ssh/%s", homedir, name); =20 if (!(virFileExists(path))) { VIR_FREE(path); @@ -565,7 +565,7 @@ virNetClientPtr virNetClientNewLibssh(const char *host, } else { confdir =3D virGetUserConfigDirectory(); if (confdir) - virAsprintf(&knownhosts, "%s/known_hosts", confdir); + knownhosts =3D g_strdup_printf("%s/known_hosts", confdir); } =20 if (privkeyPath) { @@ -599,10 +599,10 @@ virNetClientPtr virNetClientNewLibssh(const char *hos= t, if (!(nc =3D virBufferContentAndReset(&buf))) goto no_memory; =20 - virAsprintf(&command, "sh -c " - "'if '%s' -q 2>&1 | grep \"requires an argument\" >/dev/nu= ll 2>&1; then " - "ARG=3D-q0;" "else " "ARG=3D;" "fi;" "'%s' $ARG -U %s'", n= c, nc, - socketPath); + command =3D g_strdup_printf("sh -c " + "'if '%s' -q 2>&1 | grep \"requires an argum= ent\" >/dev/null 2>&1; then " + "ARG=3D-q0;" "else " "ARG=3D;" "fi;" "'%s' $= ARG -U %s'", nc, nc, + socketPath); =20 if (virNetSocketNewConnectLibssh(host, port, family, diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 4a9f976914..2fcc606993 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -341,9 +341,9 @@ virNetLibsshCheckHostKey(virNetLibsshSessionPtr sess) if (!keyhashstr) return -1; =20 - virAsprintf(&tmp, - _("Accept SSH host key with hash '%s' for " "host = '%s:%d' (%s/%s)?"), - keyhashstr, sess->hostname, sess->port, "y", "n"); + tmp =3D g_strdup_printf( + _("Accept SSH host key with hash '%s' fo= r " "host '%s:%d' (%s/%s)?"), + keyhashstr, sess->hostname, sess->port, = "y", "n"); askKey.prompt =3D tmp; =20 if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { @@ -524,7 +524,7 @@ virNetLibsshAuthenticatePrivkey(virNetLibsshSessionPtr = sess, =20 VIR_DEBUG("sess=3D%p", sess); =20 - virAsprintf(&tmp, "%s.pub", priv->filename); + tmp =3D g_strdup_printf("%s.pub", priv->filename); =20 /* try to open the public part of the private key */ ret =3D ssh_pki_import_pubkey_file(tmp, &public_key); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 2b66bc609b..f2623c58ef 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -698,7 +698,7 @@ int virNetSocketNewConnectUNIX(const char *path, goto cleanup; } =20 - virAsprintf(&lockpath, "%s/%s.lock", rundir, binname); + lockpath =3D g_strdup_printf("%s/%s.lock", rundir, binname); =20 if ((lockfd =3D open(lockpath, O_RDWR | O_CREAT, 0600)) < 0 || virSetCloseExec(lockfd) < 0) { diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 384bedfc34..5b87581b62 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -365,9 +365,10 @@ virNetSSHCheckHostKey(virNetSSHSessionPtr sess) keyhashstr =3D virBufferContentAndReset(&buff); =20 askKey.type =3D VIR_CRED_ECHOPROMPT; - virAsprintf((char **)&askKey.prompt, - _("Accept SSH host key with hash '%s' for " "host = '%s:%d' (%s/%s)?"), - keyhashstr, sess->hostname, sess->port, "y", "n"); + askKey.prompt =3D g_strdup_printf(_("Accept SSH host key with = hash '%s' for " "host '%s:%d' (%s/%s)?"), + keyhashstr, + sess->hostname, + sess->port, "y", "n"); =20 if (sess->cred->cb(&askKey, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", @@ -628,8 +629,8 @@ virNetSSHAuthenticatePrivkey(virNetSSHSessionPtr sess, return -1; } =20 - virAsprintf((char **)&retr_passphrase.prompt, - _("Passphrase for key '%s'"), priv->filename); + retr_passphrase.prompt =3D g_strdup_printf(_("Passphrase for key '%s'"= ), + priv->filename); =20 if (sess->cred->cb(&retr_passphrase, 1, sess->cred->cbdata)) { virReportError(VIR_ERR_SSH, "%s", diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index af6d29b376..7163775f74 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -796,13 +796,13 @@ static int virNetTLSContextLocateCredentials(const ch= ar *pkipath, */ if (pkipath) { VIR_DEBUG("Told to use TLS credentials in %s", pkipath); - virAsprintf(cacert, "%s/%s", pkipath, "cacert.pem"); - virAsprintf(cacrl, "%s/%s", pkipath, "cacrl.pem"); - virAsprintf(key, "%s/%s", pkipath, - isServer ? "serverkey.pem" : "clientkey.pem"); + *cacert =3D g_strdup_printf("%s/%s", pkipath, "cacert.pem"); + *cacrl =3D g_strdup_printf("%s/%s", pkipath, "cacrl.pem"); + *key =3D g_strdup_printf("%s/%s", pkipath, + isServer ? "serverkey.pem" : "clientkey.pem= "); =20 - virAsprintf(cert, "%s/%s", pkipath, - isServer ? "servercert.pem" : "clientcert.pem"); + *cert =3D g_strdup_printf("%s/%s", pkipath, + isServer ? "servercert.pem" : "clientcert.= pem"); } else if (tryUserPkiPath) { /* Check to see if $HOME/.pki contains at least one of the * files and if so, use that @@ -812,19 +812,19 @@ static int virNetTLSContextLocateCredentials(const ch= ar *pkipath, if (!userdir) goto error; =20 - virAsprintf(&user_pki_path, "%s/.pki/libvirt", userdir); + user_pki_path =3D g_strdup_printf("%s/.pki/libvirt", userdir); =20 VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_pa= th); =20 - virAsprintf(cacert, "%s/%s", user_pki_path, "cacert.pem"); + *cacert =3D g_strdup_printf("%s/%s", user_pki_path, "cacert.pem"); =20 - virAsprintf(cacrl, "%s/%s", user_pki_path, "cacrl.pem"); + *cacrl =3D g_strdup_printf("%s/%s", user_pki_path, "cacrl.pem"); =20 - virAsprintf(key, "%s/%s", user_pki_path, - isServer ? "serverkey.pem" : "clientkey.pem"); + *key =3D g_strdup_printf("%s/%s", user_pki_path, + isServer ? "serverkey.pem" : "clientkey.pem= "); =20 - virAsprintf(cert, "%s/%s", user_pki_path, - isServer ? "servercert.pem" : "clientcert.pem"); + *cert =3D g_strdup_printf("%s/%s", user_pki_path, + isServer ? "servercert.pem" : "clientcert.= pem"); =20 /* * If some of the files can't be found, fallback --=20 2.21.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list