X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-qemu-acl.patch;h=fda5d6508f23432b3079a21615d9204b1bf9cb2e;hp=13fa7eeb6dc555b1d9cca4a040b4dce75d11a81f;hb=dd619b7ec6ce3f6e0ccaaf63698d61d39a66398f;hpb=d89e7b1f844df4546925efa5d78324ce50d78a1a

diff --git a/libvirt-qemu-acl.patch b/libvirt-qemu-acl.patch
index 13fa7ee..fda5d65 100644
--- 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-1.3.2.orig/src/qemu/qemu_command.c libvirt-1.3.2/src/qemu/qemu_command.c
+--- libvirt-1.3.2.orig/src/qemu/qemu_command.c	2016-02-24 01:55:16.000000000 +0000
++++ libvirt-1.3.2/src/qemu/qemu_command.c	2016-03-18 12:33:26.562768000 +0000
+@@ -6047,6 +6047,10 @@ qemuBuildGraphicsSPICECommandLine(virQEM
+         } else {
+             virBufferAddLit(&opt, ",disable-agent-file-xfer");
+         }
++
++        if (cfg->vncACL) 
++           virBufferAddLit(&opt, ",acl");
++
+     }
+ 
+     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SEAMLESS_MIGRATION)) {
+diff -urp libvirt-1.3.2.orig/src/qemu/qemu.conf libvirt-1.3.2/src/qemu/qemu.conf
+--- libvirt-1.3.2.orig/src/qemu/qemu.conf	2016-03-18 12:16:11.000000000 +0000
++++ libvirt-1.3.2/src/qemu/qemu.conf	2016-03-18 12:33:26.556768000 +0000
+@@ -80,6 +80,15 @@
+ #vnc_sasl = 1
  
  
 +# Enable the VNC access control lists. When switched on this will
@@ -30,22 +31,10 @@ 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 @@
+diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.c libvirt-1.3.2/src/qemu/qemu_conf.c
+--- libvirt-1.3.2.orig/src/qemu/qemu_conf.c	2016-02-24 01:55:16.000000000 +0000
++++ libvirt-1.3.2/src/qemu/qemu_conf.c	2016-03-18 12:33:26.563768000 +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);
@@ -53,9 +42,10 @@ index ba41f80..7ab5eee 100644
  
      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 @@
+diff -urp libvirt-1.3.2.orig/src/qemu/qemu_conf.h libvirt-1.3.2/src/qemu/qemu_conf.h
+--- libvirt-1.3.2.orig/src/qemu/qemu_conf.h	2016-01-10 01:57:37.000000000 +0000
++++ libvirt-1.3.2/src/qemu/qemu_conf.h	2016-03-18 12:33:26.563768000 +0000
+@@ -112,6 +112,7 @@ struct _virQEMUDriverConfig {
      bool vncTLS;
      bool vncTLSx509verify;
      bool vncSASL;