-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 -ur libvirt-8.4.0.orig/src/qemu/qemu_command.c libvirt-8.4.0/src/qemu/qemu_command.c
+--- libvirt-8.4.0.orig/src/qemu/qemu_command.c 2022-06-03 00:01:50.967940423 +0200
++++ libvirt-8.4.0/src/qemu/qemu_command.c 2022-06-03 00:02:10.338979122 +0200
+@@ -8318,6 +8318,10 @@
+ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+
+ /* TODO: Support ACLs later */
++
++ if (cfg->vncACL)
++ virBufferAddLit(&opt, ",acl");
++
+ }
+
+ if (graphics->data.vnc.powerControl != VIR_TRISTATE_BOOL_ABSENT) {
+diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.c libvirt-8.4.0/src/qemu/qemu_conf.c
+--- libvirt-8.4.0.orig/src/qemu/qemu_conf.c 2022-06-03 00:01:50.967940423 +0200
++++ libvirt-8.4.0/src/qemu/qemu_conf.c 2022-06-03 00:02:13.756985948 +0200
+@@ -439,6 +439,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 (cfg->vncPassword &&
+ strlen(cfg->vncPassword) > 8) {
+diff -ur libvirt-8.4.0.orig/src/qemu/qemu_conf.h libvirt-8.4.0/src/qemu/qemu_conf.h
+--- libvirt-8.4.0.orig/src/qemu/qemu_conf.h 2022-06-03 00:01:50.967940423 +0200
++++ libvirt-8.4.0/src/qemu/qemu_conf.h 2022-06-03 00:02:13.756985948 +0200
+@@ -114,6 +114,7 @@
+ bool vncTLSx509verify;
+ bool vncTLSx509verifyPresent;
+ bool vncSASL;
++ bool vncACL;
+ char *vncTLSx509certdir;
+ char *vncTLSx509secretUUID;
+ char *vncListen;
+diff -ur libvirt-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in
+--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in 2022-06-03 00:01:50.966940421 +0200
++++ libvirt-8.4.0/src/qemu/qemu.conf.in 2022-06-03 00:03:50.351178936 +0200
+@@ -147,6 +147,15 @@
+ #vnc_sasl = 1