1 diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
2 --- libvirt-6.1.0.orig/src/qemu/qemu.conf 2020-03-06 09:49:35.413000000 +0100
3 +++ libvirt-6.1.0/src/qemu/qemu.conf 2020-03-06 09:50:04.229000000 +0100
8 +# Enable the VNC access control lists. When switched on this will
9 +# initially block all vnc users from accessing the vnc server. To
10 +# add and remove ids from the ACLs you will need to send the appropriate
11 +# commands to the qemu monitor as required by your particular version of
12 +# QEMU. See the QEMU documentation for more details.
17 # The default SASL configuration file is located in /etc/sasl/
18 # When running libvirtd unprivileged, it may be desirable to
19 # override the configs in this location. Set this parameter to
20 diff -ur libvirt-6.1.0.orig/src/qemu/qemu_command.c libvirt-6.1.0/src/qemu/qemu_command.c
21 --- libvirt-6.1.0.orig/src/qemu/qemu_command.c 2020-03-06 09:49:35.413000000 +0100
22 +++ libvirt-6.1.0/src/qemu/qemu_command.c 2020-03-06 09:50:04.230000000 +0100
23 @@ -7569,6 +7569,10 @@
24 virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
26 /* TODO: Support ACLs later */
29 + virBufferAddLit(&opt, ",acl");
33 virCommandAddArg(cmd, "-vnc");
34 diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.c libvirt-6.1.0/src/qemu/qemu_conf.c
35 --- libvirt-6.1.0.orig/src/qemu/qemu_conf.c 2020-03-06 09:49:35.410000000 +0100
36 +++ libvirt-6.1.0/src/qemu/qemu_conf.c 2020-03-06 09:50:04.230000000 +0100
39 if (virConfGetValueBool(conf, "vnc_allow_host_audio", &cfg->vncAllowHostAudio) < 0)
41 + if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
46 diff -ur libvirt-6.1.0.orig/src/qemu/qemu_conf.h libvirt-6.1.0/src/qemu/qemu_conf.h
47 --- libvirt-6.1.0.orig/src/qemu/qemu_conf.h 2020-03-06 09:49:35.409000000 +0100
48 +++ libvirt-6.1.0/src/qemu/qemu_conf.h 2020-03-06 09:50:04.230000000 +0100
50 bool vncTLSx509verify;
51 bool vncTLSx509verifyPresent;
54 char *vncTLSx509certdir;
55 char *vncTLSx509secretUUID;