X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=f709a32a38a3db42ba1557c6039a6b284a86bf0d;hb=71a5e15c242981328418b3378f76793bf4661c39;hp=e05d5dfa4aa1ddad0383852ab5edd3daff439894;hpb=b6348913329f24b2ffa0afd0bd02c528d62ee3dc;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e05d5df..f709a32 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,7 @@
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_command.c libvirt-4.5.0/src/qemu/qemu_command.c
---- libvirt-4.5.0.orig/src/qemu/qemu_command.c	2018-07-09 16:27:53.841864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_command.c	2018-07-09 16:28:11.860863521 +0000
-@@ -7859,6 +7859,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
-             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
- 
-         /* TODO: Support ACLs later */
-+
-+        if (cfg->vncACL)
-+           virBufferAddLit(&opt, ",acl");
-+
-     }
- 
-     virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
---- libvirt-4.5.0.orig/src/qemu/qemu.conf	2018-07-09 16:27:53.844864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu.conf	2018-07-09 16:28:11.861863521 +0000
-@@ -135,6 +135,15 @@
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
+--- libvirt-5.10.0.orig/src/qemu/qemu.conf	2019-12-08 00:44:49.154000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu.conf	2019-12-08 00:45:04.937000000 +0100
+@@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +17,40 @@ diff -urp libvirt-4.5.0.orig/src/qemu/qemu.conf libvirt-4.5.0/src/qemu/qemu.conf
  # The default SASL configuration file is located in /etc/sasl/
  # When running libvirtd unprivileged, it may be desirable to
  # override the configs in this location. Set this parameter to
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.c libvirt-4.5.0/src/qemu/qemu_conf.c
---- libvirt-4.5.0.orig/src/qemu/qemu_conf.c	2018-07-09 16:27:53.842864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_conf.c	2018-07-09 16:28:11.861863521 +0000
-@@ -555,6 +555,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
-+    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+        goto cleanup;
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu_command.c libvirt-5.10.0/src/qemu/qemu_command.c
+--- libvirt-5.10.0.orig/src/qemu/qemu_command.c	2019-12-08 00:44:49.154000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu_command.c	2019-12-08 00:45:04.937000000 +0100
+@@ -7875,6 +7875,10 @@
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
++
++        if (cfg->vncACL)
++           virBufferAddLit(&opt, ",acl");
++
+     }
  
+     virCommandAddArg(cmd, "-vnc");
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.c libvirt-5.10.0/src/qemu/qemu_conf.c
+--- libvirt-5.10.0.orig/src/qemu/qemu_conf.c	2019-12-08 00:44:49.152000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu_conf.c	2019-12-08 00:45:04.937000000 +0100
+@@ -400,6 +400,8 @@
+         return -1;
+     if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+         return -1;
++    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
++        return -1;
  
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.5.0.orig/src/qemu/qemu_conf.h libvirt-4.5.0/src/qemu/qemu_conf.h
---- libvirt-4.5.0.orig/src/qemu/qemu_conf.h	2018-07-09 16:27:53.842864595 +0000
-+++ libvirt-4.5.0/src/qemu/qemu_conf.h	2018-07-09 16:28:11.861863521 +0000
-@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     return 0;
+ }
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu_conf.h libvirt-5.10.0/src/qemu/qemu_conf.h
+--- libvirt-5.10.0.orig/src/qemu/qemu_conf.h	2019-12-08 00:44:49.151000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu_conf.h	2019-12-08 00:45:04.937000000 +0100
+@@ -118,6 +118,7 @@
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;