- updateed to 5.4.0

[packages/libvirt.git] / libvirt-qemu-acl.patch

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 13fa7eeb6dc555b1d9cca4a040b4dce75d11a81f..44b93a1439d4444d4b3cd111e0fe846ebfba249d 100644 (file)
--- a/libvirt-qemu-acl.patch
+++ b/libvirt-qemu-acl.patch
@@ -1,21 +1,22 @@
-From: Neil Wilson <neil@brightbox.co.uk>
-To: libvir-list@redhat.com
-Date: Mon, 10 Jan 2011 09:52:56 +0000
-Message-ID: <1294653176.3013.16.camel@lenovo-3000-n100>
-
-Hi,
-
-Here's the patch to add basic ACL support to QEMU within libvirt. Like
-SASL it's ignored by RHEL5's default qemu. Newer qemu picks it up as
-expected and you can manipulate the acls using 'virsh'. 
-
-
-diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
-index ba41f80..7ab5eee 100644
---- a/src/qemu/qemu.conf
-+++ b/src/qemu/qemu.conf
-@@ -71,6 +71,15 @@
- # vnc_sasl = 1
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu_command.c libvirt-5.4.0/src/qemu/qemu_command.c
+--- libvirt-5.4.0.orig/src/qemu/qemu_command.c 2019-06-17 20:19:15.321000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu_command.c      2019-06-17 20:19:33.942000000 +0200
+@@ -8280,6 +8280,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-5.4.0.orig/src/qemu/qemu.conf libvirt-5.4.0/src/qemu/qemu.conf
+--- libvirt-5.4.0.orig/src/qemu/qemu.conf      2019-06-17 20:19:15.325000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu.conf   2019-06-17 20:19:33.943000000 +0200
+@@ -141,6 +141,15 @@
+ #vnc_sasl = 1
  
  
 +# Enable the VNC access control lists. When switched on this will
@@ -30,36 +31,26 @@ index ba41f80..7ab5eee 100644
  # 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
---- libvirt-1.0.6/src/qemu/qemu_command.c.orig 2013-06-16 15:45:37.115181922 +0200
-+++ libvirt-1.0.6/src/qemu/qemu_command.c      2013-06-16 15:47:49.335179175 +0200
-@@ -6178,6 +6178,10 @@
- 
-             /* TODO: Support ACLs later */
-         }
-+
-+        if (cfg->vncACL) 
-+           virBufferAddLit(&opt, ",acl");
-+
-     }
- 
-     virCommandAddArg(cmd, "-vnc");
---- libvirt-1.1.3/src/qemu/qemu_conf.c.orig    2013-10-22 20:38:43.522043292 +0200
-+++ libvirt-1.1.3/src/qemu/qemu_conf.c 2013-10-22 20:45:19.515360007 +0200
-@@ -357,6 +357,7 @@
-     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 -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.c libvirt-5.4.0/src/qemu/qemu_conf.c
+--- libvirt-5.4.0.orig/src/qemu/qemu_conf.c    2019-06-17 20:19:15.323000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu_conf.c 2019-06-17 20:19:33.943000000 +0200
+@@ -471,6 +471,8 @@ virQEMUDriverConfigLoadVNCEntry(virQEMUD
+         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) {
---- libvirt-1.0.3/src/qemu/qemu_conf.h.orig    2013-03-09 13:10:30.059751685 +0100
-+++ libvirt-1.0.3/src/qemu/qemu_conf.h 2013-03-09 13:54:17.296308093 +0100
-@@ -102,6 +102,7 @@
-     bool vncTLS;
+     return 0;
+ }
+diff -urp libvirt-5.4.0.orig/src/qemu/qemu_conf.h libvirt-5.4.0/src/qemu/qemu_conf.h
+--- libvirt-5.4.0.orig/src/qemu/qemu_conf.h    2019-06-17 20:19:15.323000000 +0200
++++ libvirt-5.4.0/src/qemu/qemu_conf.h 2019-06-17 20:19:33.944000000 +0200
+@@ -124,6 +124,7 @@ struct _virQEMUDriverConfig {
      bool vncTLSx509verify;
+     bool vncTLSx509verifyPresent;
      bool vncSASL;
 +    bool vncACL;
      char *vncTLSx509certdir;
+     char *vncTLSx509secretUUID;
      char *vncListen;
-     char *vncPassword;