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

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 346926c..f709a32 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,7 @@
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu_command.c libvirt-1.3.3/src/qemu/qemu_command.c
---- libvirt-1.3.3.orig/src/qemu/qemu_command.c	2016-04-14 10:17:35.131170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_command.c	2016-04-14 10:30:12.861170000 +0000
-@@ -7336,6 +7336,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-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf
---- libvirt-1.3.3.orig/src/qemu/qemu.conf	2016-04-14 10:17:35.131170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu.conf	2016-04-14 10:18:01.034170000 +0000
-@@ -80,6 +80,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,25 +17,40 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/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-1.3.3.orig/src/qemu/qemu_conf.c libvirt-1.3.3/src/qemu/qemu_conf.c
---- libvirt-1.3.3.orig/src/qemu/qemu_conf.c	2016-04-14 10:17:35.130170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_conf.c	2016-04-14 10:18:01.034170000 +0000
-@@ -536,6 +536,7 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-     GET_VALUE_STR("vnc_sasl_dir", cfg->vncSASLdir);
-     GET_VALUE_BOOL("vnc_allow_host_audio", cfg->vncAllowHostAudio);
-     GET_VALUE_BOOL("nographics_allow_host_audio", cfg->nogfxAllowHostAudio);
-+    GET_VALUE_LONG("vnc_acl", cfg->vncACL);
+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;
  
-     p = virConfGetValue(conf, "security_driver");
-     if (p && p->type == VIR_CONF_LIST) {
-diff -urp libvirt-1.3.3.orig/src/qemu/qemu_conf.h libvirt-1.3.3/src/qemu/qemu_conf.h
---- libvirt-1.3.3.orig/src/qemu/qemu_conf.h	2016-04-14 10:17:35.130170000 +0000
-+++ libvirt-1.3.3/src/qemu/qemu_conf.h	2016-04-14 10:18:01.035170000 +0000
-@@ -112,6 +112,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;