X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=3ea5678584ab91fb1fa69acc912ba4f2e5b2afbf;hb=bc937a84a2db6acd07b2996f197d3db2f38922fb;hp=afb752e68d067dbcaff19ac950b68c54829527f4;hpb=220284abd9e3eba309f18d911bc9f86d1293d677;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index afb752e..3ea5678 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,7 @@
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu_command.c libvirt-2.3.0/src/qemu/qemu_command.c
---- libvirt-2.3.0.orig/src/qemu/qemu_command.c	2016-10-28 19:15:31.893715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_command.c	2016-10-28 19:15:54.915715000 +0000
-@@ -7536,6 +7536,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.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
---- libvirt-2.3.0.orig/src/qemu/qemu.conf	2016-10-28 19:15:31.898715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu.conf	2016-10-28 19:15:54.916715000 +0000
-@@ -104,6 +104,15 @@
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu.conf libvirt-6.10.0/src/qemu/qemu.conf
+--- libvirt-6.10.0.orig/src/qemu/qemu.conf	2021-01-01 20:40:17.379692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu.conf	2021-01-01 20:40:45.381692686 +0100
+@@ -147,6 +147,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +17,40 @@ diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.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.3.0.orig/src/qemu/qemu_conf.c libvirt-2.3.0/src/qemu/qemu_conf.c
---- libvirt-2.3.0.orig/src/qemu/qemu_conf.c	2016-10-28 19:15:31.894715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_conf.c	2016-10-28 19:15:54.917715000 +0000
-@@ -468,6 +468,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.10.0.orig/src/qemu/qemu_command.c libvirt-6.10.0/src/qemu/qemu_command.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_command.c	2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_command.c	2021-01-01 20:40:45.382692686 +0100
+@@ -7597,6 +7597,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.10.0.orig/src/qemu/qemu_conf.c libvirt-6.10.0/src/qemu/qemu_conf.c
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.c	2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_conf.c	2021-01-01 20:40:45.382692686 +0100
+@@ -446,6 +446,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.3.0.orig/src/qemu/qemu_conf.h libvirt-2.3.0/src/qemu/qemu_conf.h
---- libvirt-2.3.0.orig/src/qemu/qemu_conf.h	2016-10-28 19:15:31.894715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu_conf.h	2016-10-28 19:15:54.917715000 +0000
-@@ -116,6 +116,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     return 0;
+ }
+diff -ur libvirt-6.10.0.orig/src/qemu/qemu_conf.h libvirt-6.10.0/src/qemu/qemu_conf.h
+--- libvirt-6.10.0.orig/src/qemu/qemu_conf.h	2021-01-01 20:40:17.375692686 +0100
++++ libvirt-6.10.0/src/qemu/qemu_conf.h	2021-01-01 20:40:45.383692686 +0100
+@@ -116,6 +116,7 @@
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;