-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");
- }
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_command.c libvirt-4.2.0/src/qemu/qemu_command.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_command.c 2018-04-12 12:47:51.427576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_command.c 2018-04-12 12:48:01.793576849 +0000
+@@ -7893,6 +7893,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+ virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir);
+
+ /* TODO: Support ACLs later */
+
-+ if (cfg->vncACL)
++ 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 @@
+ virCommandAddArg(cmd, "-vnc");
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf
+--- libvirt-4.2.0.orig/src/qemu/qemu.conf 2018-04-12 12:47:51.430576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu.conf 2018-04-12 12:48:01.794576849 +0000
+@@ -135,6 +135,15 @@
#vnc_sasl = 1
# 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-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);
-+ GET_VALUE_LONG("vnc_acl", cfg->vncACL);
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.c libvirt-4.2.0/src/qemu/qemu_conf.c
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.c 2018-04-12 12:47:51.428576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_conf.c 2018-04-12 12:48:01.794576849 +0000
+@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
+ goto cleanup;
+ if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
+ goto cleanup;
++ if (virConfGetValueBool(conf, "vnc_acl", &cfg->vncACL) < 0)
++ goto cleanup;
+
- p = virConfGetValue(conf, "security_driver");
- if (p && p->type == VIR_CONF_LIST) {
-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 {
+ if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
+diff -urp libvirt-4.2.0.orig/src/qemu/qemu_conf.h libvirt-4.2.0/src/qemu/qemu_conf.h
+--- libvirt-4.2.0.orig/src/qemu/qemu_conf.h 2018-04-12 12:47:51.428576965 +0000
++++ libvirt-4.2.0/src/qemu/qemu_conf.h 2018-04-12 12:48:01.794576849 +0000
+@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
bool vncTLS;
bool vncTLSx509verify;
bool vncSASL;