-diff -urp libvirt-4.0.0.orig/src/qemu/qemu_command.c libvirt-4.0.0/src/qemu/qemu_command.c
---- libvirt-4.0.0.orig/src/qemu/qemu_command.c 2018-01-24 12:03:25.563517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_command.c 2018-01-24 12:03:45.990516235 +0000
-@@ -8091,6 +8091,10 @@ qemuBuildGraphicsVNCCommandLine(virQEMUD
+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 */
}
virCommandAddArg(cmd, "-vnc");
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu.conf libvirt-4.0.0/src/qemu/qemu.conf
---- libvirt-4.0.0.orig/src/qemu/qemu.conf 2018-01-24 12:03:25.566517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu.conf 2018-01-24 12:03:45.991516235 +0000
-@@ -135,6 +135,15 @@
+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
# 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-4.0.0.orig/src/qemu/qemu_conf.c libvirt-4.0.0/src/qemu/qemu_conf.c
---- libvirt-4.0.0.orig/src/qemu/qemu_conf.c 2018-01-24 12:03:25.564517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_conf.c 2018-01-24 12:03:45.991516235 +0000
-@@ -524,6 +524,8 @@ int virQEMUDriverConfigLoadFile(virQEMUD
- goto cleanup;
- if (virConfGetValueBool(conf, "nographics_allow_host_audio", &cfg->nogfxAllowHostAudio) < 0)
- goto cleanup;
+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)
-+ goto cleanup;
++ return -1;
-
- if (virConfGetValueStringList(conf, "security_driver", true, &cfg->securityDriverNames) < 0)
-diff -urp libvirt-4.0.0.orig/src/qemu/qemu_conf.h libvirt-4.0.0/src/qemu/qemu_conf.h
---- libvirt-4.0.0.orig/src/qemu/qemu_conf.h 2018-01-24 12:03:25.564517453 +0000
-+++ libvirt-4.0.0/src/qemu/qemu_conf.h 2018-01-24 12:03:45.991516235 +0000
-@@ -121,6 +121,7 @@ struct _virQEMUDriverConfig {
- 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;