From nobody Sun Feb 8 17:22:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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=1573728232; cv=none; d=zoho.com; s=zohoarc; b=GK4tW0kVp1Jwig8HhzQBtWfbReSV4yKA4dWzgPr2ZYKxgC7O7oyK+R4Qesu+dDk5fFwi8tT3TGgn4n5bURn6rvIohQIqhyfCGz5zUbg8teMwFvC8/iYyPpc2XQn5OtjoYh3he/eCteUci0av74vDmjuzUcBCp1K5Xf2CKyr/Uf0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1573728232; 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=tkMTG8FfxCXIFQqtrg00CV2QThKsPQ35hwWMlkryFbQ=; b=SN4A4kRKMZIicMUgebWHw9vaW1JFvKOJJxU3VfEdcg1/AmbVf3Xaq0PyF9wy+CTqd7mC7uVMG80djttGgkmNdoLtGFPZYIGkFsOks5D+wjJjcsnUu58PgYnTN9V9hMKWXJrABF4s4t4kmeUibQVHlStEdojbwydeQD8hyPanVMw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of redhat.com designates 207.211.31.81 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-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1573728232220864.6029760389807; Thu, 14 Nov 2019 02:43:52 -0800 (PST) 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-411-NZRZHVLXO46DdgmLBr6xlA-1; Thu, 14 Nov 2019 05:43:48 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D436C107BA9C; Thu, 14 Nov 2019 10:43:42 +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 AFE975C219; Thu, 14 Nov 2019 10:43:42 +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 6DEE64E56D; Thu, 14 Nov 2019 10:43:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xAEAhcS3005609 for ; Thu, 14 Nov 2019 05:43:38 -0500 Received: by smtp.corp.redhat.com (Postfix) id 804645F76D; Thu, 14 Nov 2019 10:43:38 +0000 (UTC) Received: from angien.redhat.com (unknown [10.43.2.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0AE5C5F799 for ; Thu, 14 Nov 2019 10:43:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573728231; 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=tkMTG8FfxCXIFQqtrg00CV2QThKsPQ35hwWMlkryFbQ=; b=HqQS0tqWr+on7ghtQvhvJhRG+2OUDYV53ZXH+FQioXQ7Z7wd+QtAjY0Q+p1KQUoHk2Z577 n6tJ9R6GrTtlb7+oi3jvx4xDsSxrKBpDD1c83Hq0+P+ylHh5NH5ldH6Wda9QiaWVO0K1zo M9xwhS0bLSmLxYe3aInLspZfqkoCg58= From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 14 Nov 2019 11:43:29 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 1/5] rpc: use virStringSplit instead of strsep 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.16 X-MC-Unique: NZRZHVLXO46DdgmLBr6xlA-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" When parsing allowed authentication methods for the native ssh lib trasnports we used strsep. Since we have virStringSplit helper let's use that one. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko Reviewed-by: Pavel Hrdina --- src/rpc/virnetsocket.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index c9b2a16fe5..21ef7a8034 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -944,9 +944,8 @@ virNetSocketNewConnectLibSSH2(const char *host, int ret =3D -1; int portN; - char *authMethodNext =3D NULL; - char *authMethodsCopy =3D NULL; - char *authMethod; + VIR_AUTOSTRINGLIST authMethodList =3D NULL; + char **authMethodNext; /* port number will be verified while opening the socket */ if (virStrToLong_i(port, NULL, 10, &portN) < 0) { @@ -987,11 +986,12 @@ virNetSocketNewConnectLibSSH2(const char *host, if (virNetSSHSessionSetChannelCommand(sess, command) !=3D 0) goto error; - authMethodsCopy =3D g_strdup(authMethods); + if (!(authMethodList =3D virStringSplit(authMethods, ",", 0))) + goto error; - authMethodNext =3D authMethodsCopy; + for (authMethodNext =3D authMethodList; *authMethodNext; authMethodNex= t++) { + const char *authMethod =3D *authMethodNext; - while ((authMethod =3D strsep(&authMethodNext, ","))) { if (STRCASEEQ(authMethod, "keyboard-interactive")) { ret =3D virNetSSHSessionAuthAddKeyboardAuth(sess, username, -1= ); } else if (STRCASEEQ(authMethod, "password")) { @@ -1028,13 +1028,11 @@ virNetSocketNewConnectLibSSH2(const char *host, sock->sshSession =3D sess; *retsock =3D sock; - VIR_FREE(authMethodsCopy); return 0; error: virObjectUnref(sock); virObjectUnref(sess); - VIR_FREE(authMethodsCopy); return ret; } #else @@ -1079,9 +1077,8 @@ virNetSocketNewConnectLibssh(const char *host, int ret =3D -1; int portN; - char *authMethodNext =3D NULL; - char *authMethodsCopy =3D NULL; - char *authMethod; + VIR_AUTOSTRINGLIST authMethodList =3D NULL; + char **authMethodNext; /* port number will be verified while opening the socket */ if (virStrToLong_i(port, NULL, 10, &portN) < 0) { @@ -1121,11 +1118,12 @@ virNetSocketNewConnectLibssh(const char *host, if (virNetLibsshSessionSetChannelCommand(sess, command) !=3D 0) goto error; - authMethodsCopy =3D g_strdup(authMethods); + if (!(authMethodList =3D virStringSplit(authMethods, ",", 0))) + goto error; - authMethodNext =3D authMethodsCopy; + for (authMethodNext =3D authMethodList; *authMethodNext; authMethodNex= t++) { + const char *authMethod =3D *authMethodNext; - while ((authMethod =3D strsep(&authMethodNext, ","))) { if (STRCASEEQ(authMethod, "keyboard-interactive")) { ret =3D virNetLibsshSessionAuthAddKeyboardAuth(sess, -1); } else if (STRCASEEQ(authMethod, "password")) { @@ -1164,13 +1162,11 @@ virNetSocketNewConnectLibssh(const char *host, sock->ownsFd =3D false; *retsock =3D sock; - VIR_FREE(authMethodsCopy); return 0; error: virObjectUnref(sock); virObjectUnref(sess); - VIR_FREE(authMethodsCopy); return ret; } #else --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list