From nobody Mon Feb 9 02:51:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 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=1673972486; cv=none; d=zohomail.com; s=zohoarc; b=fWKLNeP7dhvH6qizjAK8oyr2AQ41tTKrJlEEJdY3hFSBPVgfbuBkOFrXcL6GcScUv7SusxSkWbqzm4HEnRqLrY1EORRNyWlQQMn0SzpMLpNSN5mUGn5kVB0cdRz5FkGD8MjkZ+Y0IWspv7wY2O59cDliHPJIjYGEnIh0xmNOtTI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673972486; 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=X62oRqazvWl669ARTdnxURAItuzIFgNnW7W7kmHx1OU=; b=Yyz0QuFCrNtvHN+sW9M4nL0y1rqKicQc1dAy+YvH46Ew6gwdVY9xkxdm1/jvEpcTtAlXXvDZ4/a4vBNyyPbgX1ysjw2l+90o/yBJe1eV6ElyxWIZMCgYiQ8HAFdOIixqkfHk09lgK0Mzr5C1bCV6g9uVuNILNFjY31lvn4ctaOI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 167397248620947.91757902352367; Tue, 17 Jan 2023 08:21:26 -0800 (PST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-227-de1BPw-2MS6EcvXpgQs7vQ-1; Tue, 17 Jan 2023 11:21:19 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9912C19705D0; Tue, 17 Jan 2023 16:20:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82D7C4078903; Tue, 17 Jan 2023 16:20:44 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D91471946A79; Tue, 17 Jan 2023 16:20:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 82B2619465A3 for ; Tue, 17 Jan 2023 16:20:43 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 74E871121318; Tue, 17 Jan 2023 16:20:43 +0000 (UTC) Received: from speedmetal.lan (ovpn-208-29.brq.redhat.com [10.40.208.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id E39491121315 for ; Tue, 17 Jan 2023 16:20:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673972485; 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=X62oRqazvWl669ARTdnxURAItuzIFgNnW7W7kmHx1OU=; b=KmshcU3gbhg3RzsroaPpwcvIuRgHnIJ6LjZEBwL1atKejsn6I+fFVKkg2m3764rhpJo6pl U2aIXVT02PBg4yP8cybD3K5MmwVjLBHU+xQcqoyfkuUnFj48v4AVKf7V63qLBPsqr1DWK+ IHs7CShI8JOw+N3WhDoMwgqvff+XBck= X-MC-Unique: de1BPw-2MS6EcvXpgQs7vQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 01/15] virNetLibsshSessionAuthAddPrivKeyAuth: Drop 'password' argument Date: Tue, 17 Jan 2023 17:20:26 +0100 Message-Id: <7bc357e1aac2684944c320fa023338cf2403e968.1673972406.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1673972486726100004 Content-Type: text/plain; charset="utf-8" The only caller doesn't actually populate it. Remove it to simplify internals. Signed-off-by: Peter Krempa --- src/rpc/virnetlibsshsession.c | 4 +--- src/rpc/virnetlibsshsession.h | 3 +-- src/rpc/virnetsocket.c | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index b1420bea2c..bbc5d54386 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -988,8 +988,7 @@ virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession= *sess) int virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess, - const char *keyfile, - const char *password) + const char *keyfile) { virNetLibsshAuthMethod *auth; @@ -1006,7 +1005,6 @@ virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSes= sion *sess, return -1; } - auth->password =3D g_strdup(password); auth->filename =3D g_strdup(keyfile); auth->method =3D VIR_NET_LIBSSH_AUTH_PRIVKEY; auth->ssh_flags =3D SSH_AUTH_METHOD_PUBLICKEY; diff --git a/src/rpc/virnetlibsshsession.h b/src/rpc/virnetlibsshsession.h index c3b5f3e80d..7f94fd15dc 100644 --- a/src/rpc/virnetlibsshsession.h +++ b/src/rpc/virnetlibsshsession.h @@ -46,8 +46,7 @@ int virNetLibsshSessionAuthAddPasswordAuth(virNetLibsshSe= ssion *sess, int virNetLibsshSessionAuthAddAgentAuth(virNetLibsshSession *sess); int virNetLibsshSessionAuthAddPrivKeyAuth(virNetLibsshSession *sess, - const char *keyfile, - const char *password); + const char *keyfile); int virNetLibsshSessionAuthAddKeyboardAuth(virNetLibsshSession *sess, int tries); diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 8280bda007..8fbc69d51c 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1080,9 +1080,7 @@ virNetSocketNewConnectLibssh(const char *host, } else if (STRCASEEQ(authMethod, "password")) { ret =3D virNetLibsshSessionAuthAddPasswordAuth(sess, uri); } else if (STRCASEEQ(authMethod, "privkey")) { - ret =3D virNetLibsshSessionAuthAddPrivKeyAuth(sess, - privkey, - NULL); + ret =3D virNetLibsshSessionAuthAddPrivKeyAuth(sess, privkey); } else if (STRCASEEQ(authMethod, "agent")) { ret =3D virNetLibsshSessionAuthAddAgentAuth(sess); } else { --=20 2.38.1