X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=d473146cbee36426ae3d78eac7fe6725a0d32339;hb=1d5f75a19e11fab11f6c4bff93013b81264880dd;hp=e4781d2b3fef2d1db8b0d86897bc23c9ad1f77c4;hpb=f08e2de848020f421ff12e52ee56c58506abe1f6;p=packages%2Flibvirt.git

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index e4781d2..d473146 100644
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,7 +1,7 @@
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu_command.c
---- libvirt-4.0.0.orig/src/qemu/qemu_command.c	2018-01-24 12:03:25.563517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_command.c	2018-01-24 12:03:45.990516235 +0000
-@@ -8091,6 +8091,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_command.c libvirt-5.8.0/src/qemu/qemu_command.c
+--- libvirt-5.8.0.orig/src/qemu/qemu_command.c	2019-10-20 16:07:26.267000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_command.c	2019-10-20 16:07:44.191000000 +0200
+@@ -7952,6 +7952,10 @@
              virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
  
          /* TODO: Support ACLs later */
@@ -12,10 +12,10 @@ diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu
      }
  
      virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf
---- libvirt-4.0.0.orig/src/qemu/qemu.conf	2018-01-24 12:03:25.566517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu.conf	2018-01-24 12:03:45.991516235 +0000
-@@ -135,6 +135,15 @@
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu.conf libvirt-5.8.0/src/qemu/qemu.conf
+--- libvirt-5.8.0.orig/src/qemu/qemu.conf	2019-10-20 16:07:26.267000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu.conf	2019-10-20 16:07:44.192000000 +0200
+@@ -141,6 +141,15 @@
  #vnc_sasl = 1
  
  
@@ -31,26 +31,26 @@ diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.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.0.0.orig/src/qemu/qemu_conf.c libvirt-4.0.0/src/qemu/qemu_conf.c
---- libvirt-4.0.0.orig/src/qemu/qemu_conf.c	2018-01-24 12:03:25.564517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_conf.c	2018-01-24 12:03:45.991516235 +0000
-@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
-         goto cleanup;
-     if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
-         goto cleanup;
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.c libvirt-5.8.0/src/qemu/qemu_conf.c
+--- libvirt-5.8.0.orig/src/qemu/qemu_conf.c	2019-10-20 16:07:26.266000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_conf.c	2019-10-20 16:07:44.192000000 +0200
+@@ -443,6 +443,8 @@
+         return -1;
+     if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
+         return -1;
 +    if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
-+        goto cleanup;
++        return -1;
  
- 
-     if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.h libvirt-4.0.0/src/qemu/qemu_conf.h
---- libvirt-4.0.0.orig/src/qemu/qemu_conf.h	2018-01-24 12:03:25.564517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_conf.h	2018-01-24 12:03:45.991516235 +0000
-@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
-     bool vncTLS;
+     return 0;
+ }
+diff -ur libvirt-5.8.0.orig/src/qemu/qemu_conf.h libvirt-5.8.0/src/qemu/qemu_conf.h
+--- libvirt-5.8.0.orig/src/qemu/qemu_conf.h	2019-10-20 16:07:26.265000000 +0200
++++ libvirt-5.8.0/src/qemu/qemu_conf.h	2019-10-20 16:07:44.192000000 +0200
+@@ -118,6 +118,7 @@
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;