From nobody Sat Apr 27 01:05:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568020274; cv=none; d=zoho.com; s=zohoarc; b=YzKiVTW/dYMqhzY0eVjGvnjQdxYP3oFdgCOYqF5IsPWaMjcdHSkEpZ53yEqhFF6z/5PW9RUreS9fv07T9oXZqUb9sdLQljnItAaW5nnUM5m0S/6rhIenDyKUTpXcuxSHINVa+vgwfBusE8eSgJ/XSLc9d3v+4zJpaku0Fi1iFPY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568020274; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=HVqXUdLVmdnbV9ynrhIuFZa0mZvHttmwSyvAuz7TA+8=; b=UwWtxr1JMmFM71yvg0a9LmA8ejuiCYyMwdrbGEDStXYHvjj5p+lr2a6iA4WpWX8W+o6N7zVENXxRukLcCfCV3sn1Kd+6ij0ayiyRM+NU7qflZNlpjQGCkex3iagUIN3nwzwPlRbHYZIfteEfVrhZP79hQf4YQ1H0EhOWl3WhbeQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1568020274172946.7008385267102; Mon, 9 Sep 2019 02:11:14 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B721B30C0619; Mon, 9 Sep 2019 09:11:11 +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 3989E10018FF; Mon, 9 Sep 2019 09:11:11 +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 41791180B536; Mon, 9 Sep 2019 09:11:10 +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 x86LaUWZ030755 for ; Fri, 6 Sep 2019 17:36:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DD1B5EE1D; Fri, 6 Sep 2019 21:36:30 +0000 (UTC) Received: from mx1.redhat.com (ext-mx16.extmail.prod.ext.phx2.redhat.com [10.5.110.45]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18CAB5D712 for ; Fri, 6 Sep 2019 21:36:24 +0000 (UTC) Received: from mail.eoc.io (monika.eoc.io [151.80.47.123]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C25C309DF01 for ; Fri, 6 Sep 2019 21:36:20 +0000 (UTC) Received: from momo.fritz.box (raquel.voor.money [83.162.233.233]) by mail.eoc.io (Postfix) with ESMTPSA id 46Q9tl4Jlsz4yHNb; Fri, 6 Sep 2019 23:39:27 +0200 (CEST) From: eater <=@eater.me> To: libvir-list@redhat.com Date: Fri, 6 Sep 2019 23:36:17 +0200 Message-Id: <20190906213617.26907-1-=@eater.me> MIME-Version: 1.0 X-Greylist: Sender passed SPF test, ACL 264 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 06 Sep 2019 21:36:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Fri, 06 Sep 2019 21:36:22 +0000 (UTC) for IP:'151.80.47.123' DOMAIN:'monika.eoc.io' HELO:'mail.eoc.io' FROM:'@eater.me' RCPT:'' X-RedHat-Spam-Score: 0 (SPF_HELO_NONE, SPF_PASS) 151.80.47.123 monika.eoc.io 151.80.47.123 monika.eoc.io <=@eater.me> X-Scanned-By: MIMEDefang 2.84 on 10.5.110.45 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com X-Mailman-Approved-At: Mon, 09 Sep 2019 05:11:08 -0400 Cc: eater <=@eater.me> Subject: [libvirt] [PATCH] libvirtd: Fix control socket path being incorrectly build 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: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Mon, 09 Sep 2019 09:11:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Socket path in 5.7 would result in libvirt//var/run/libvirt-sock instead of= /var/run/libvirt/libvirt-sock Signed-off-by: eater <=3D@eater.me> --- src/remote/remote_daemon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 546328b24d..5d64397062 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config, =20 if (config->unix_sock_dir) { if (virAsprintf(sockfile, "%s/%s-sock", - SOCK_PREFIX, config->unix_sock_dir) < 0) + config->unix_sock_dir, SOCK_PREFIX) < 0) goto cleanup; =20 if (privileged) { if (virAsprintf(rosockfile, "%s/%s-sock-ro", - SOCK_PREFIX, config->unix_sock_dir) < 0 || + config->unix_sock_dir, SOCK_PREFIX) < 0 || virAsprintf(admsockfile, "%s/%s-admin-sock", - SOCK_PREFIX, config->unix_sock_dir) < 0) + config->unix_sock_dir, SOCK_PREFIX) < 0) goto cleanup; } } else { --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list