libvirtd: Fix control socket path being incorrectly build

[libvirt] [PATCH] libvirtd: Fix control socket path being incorrectly build

Posted by eater 4 years, 7 months ago

Socket path in 5.7 would result in libvirt//var/run/libvirt-sock instead of /var/run/libvirt/libvirt-sock

Signed-off-by: eater <=@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,
 
     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;
 
         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 {
-- 
2.23.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] libvirtd: Fix control socket path being incorrectly build

Posted by Daniel P. Berrangé 4 years, 7 months ago

On Fri, Sep 06, 2019 at 11:36:17PM +0200, eater wrote:
> Socket path in 5.7 would result in libvirt//var/run/libvirt-sock instead of /var/run/libvirt/libvirt-sock
> 
> Signed-off-by: eater <=@eater.me>

Thanks for your contribution, but I'm afraid we can't accept patches with
psuedonyms / fake names.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] libvirtd: Fix control socket path being incorrectly build

Posted by Daniel P. Berrangé 4 years, 7 months ago

On Mon, Sep 09, 2019 at 10:19:22AM +0100, Daniel P. Berrangé wrote:
> On Fri, Sep 06, 2019 at 11:36:17PM +0200, eater wrote:
> > Socket path in 5.7 would result in libvirt//var/run/libvirt-sock instead of /var/run/libvirt/libvirt-sock
> > 
> > Signed-off-by: eater <=@eater.me>
> 
> Thanks for your contribution, but I'm afraid we can't accept patches with
> psuedonyms / fake names.

We discussed this on IRC and 'eater' is not comfortable with putting
personal information on the patch.

Since this patch is trivial & is exactly the same way anyone would fix
this bug, it can reasonably be considered non-copyrightable material.
As such I'm ok with adding my own Signed-off-by on this code too, and
pushing with the psuedonym still present.

The policy about not using psuedonyms will still stand for any patch
which is non-trivial & thus considered copyrightable.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list