X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=03959ac125aa81997b9faa7dde11ab3e72002323;hb=a4d48f2afa2708148b456a16ea98c9e7779ac14f;hp=e2de6e56806e13b835e38e018345cf727e1c3676;hpb=5362742718a035681452094c18259125ad56676e;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e2de6e5..03959ac 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,7 @@
-diff -urp libvirt-2.1.0.orig/src/qemu/qemu_command.c libvirt-2.1.0/src/qemu/qemu_command.c
---- libvirt-2.1.0.orig/src/qemu/qemu_command.c	2016-08-20 10:12:37.332554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_command.c	2016-08-20 10:13:30.288554000 +0000
-@@ -7519,6 +7519,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-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf
---- libvirt-2.1.0.orig/src/qemu/qemu.conf	2016-08-20 10:12:37.337554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu.conf	2016-08-20 10:13:30.289554000 +0000
-@@ -80,6 +80,15 @@
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
+--- libvirt-6.1.0.orig/src/qemu/qemu.conf	2020-03-06 09:49:35.413000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu.conf	2020-03-06 09:50:04.229000000 +0100
+@@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +17,40 @@ diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.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-2.1.0.orig/src/qemu/qemu_conf.c libvirt-2.1.0/src/qemu/qemu_conf.c
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.c	2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.c	2016-08-20 10:15:22.160554000 +0000
-@@ -425,6 +425,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-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_command.c
+--- libvirt-6.1.0.orig/src/qemu/qemu_command.c	2020-03-06 09:49:35.413000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu_command.c	2020-03-06 09:50:04.230000000 +0100
+@@ -7569,6 +7569,10 @@
+             virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+ 
+         /* TODO: Support ACLs later */
++
++        if (cfg->vncACL)
++           virBufferAddLit(&opt, ",acl");
++
+     }
  
+     virCommandAddArg(cmd, "-vnc");
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_conf.c
+--- libvirt-6.1.0.orig/src/qemu/qemu_conf.c	2020-03-06 09:49:35.410000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu_conf.c	2020-03-06 09:50:04.230000000 +0100
+@@ -428,6 +428,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-2.1.0.orig/src/qemu/qemu_conf.h libvirt-2.1.0/src/qemu/qemu_conf.h
---- libvirt-2.1.0.orig/src/qemu/qemu_conf.h	2016-08-20 10:12:37.334554000 +0000
-+++ libvirt-2.1.0/src/qemu/qemu_conf.h	2016-08-20 10:13:30.294554000 +0000
-@@ -113,6 +113,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     return 0;
+ }
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.0/src/qemu/qemu_conf.h
+--- libvirt-6.1.0.orig/src/qemu/qemu_conf.h	2020-03-06 09:49:35.409000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu_conf.h	2020-03-06 09:50:04.230000000 +0100
+@@ -118,6 +118,7 @@
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;