提交 ec78c9a0 编写于 作者: E eater 提交者: Daniel P. Berrangé

remote: fix UNIX socket path being incorrectly built for libvirtd

As a result of changes in

      commit d5f0c1b6
      Author: Daniel P. Berrangé <berrange@redhat.com>
      Date:   Thu Jul 18 12:30:22 2019 +0100

        remote: stop trying to print help as giant blocks of text

The socket path built would be libvirt//var/run/libvirt-sock
instead of /var/run/libvirt/libvirt-sock. Fortunately this only
affects users who have set the 'unix_sock_dir' config parameter
in /etc/libvirt/libvirtd.conf, which is pretty rare/unusual.
Signed-off-by: Neater <=@eater.me>

Exception made for the psuedonym above since patch is considered
trivial & thus non-copyrightable material.
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 d301bc8d
...@@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config, ...@@ -226,14 +226,14 @@ daemonUnixSocketPaths(struct daemonConfig *config,
if (config->unix_sock_dir) { if (config->unix_sock_dir) {
if (virAsprintf(sockfile, "%s/%s-sock", if (virAsprintf(sockfile, "%s/%s-sock",
SOCK_PREFIX, config->unix_sock_dir) < 0) config->unix_sock_dir, SOCK_PREFIX) < 0)
goto cleanup; goto cleanup;
if (privileged) { if (privileged) {
if (virAsprintf(rosockfile, "%s/%s-sock-ro", 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", virAsprintf(admsockfile, "%s/%s-admin-sock",
SOCK_PREFIX, config->unix_sock_dir) < 0) config->unix_sock_dir, SOCK_PREFIX) < 0)
goto cleanup; goto cleanup;
} }
} else { } else {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册