-diff -urp libvirt-4.0.0.orig/daemon/libvirtd.conf libvirt-4.0.0/daemon/libvirtd.conf
---- libvirt-4.0.0.orig/daemon/libvirtd.conf 2018-01-24 11:43:38.147588228 +0000
-+++ libvirt-4.0.0/daemon/libvirtd.conf 2018-01-24 11:44:02.010586806 +0000
-@@ -123,7 +123,7 @@
- # the network providing auth (eg, TLS/x509 certificates)
- #
- # - sasl: use SASL infrastructure. The actual auth scheme is then
--# controlled from /etc/sasl2/libvirt.conf. For the TCP
-+# controlled from /etc/sasl/libvirt.conf. For the TCP
- # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
- # For non-TCP or TLS sockets, any scheme is allowed.
- #
-@@ -154,7 +154,7 @@
- # If you don't enable SASL, then all TCP traffic is cleartext.
- # Don't do this outside of a dev/test scenario. For real world
- # use, always enable SASL and use the GSSAPI or DIGEST-MD5
--# mechanism in /etc/sasl2/libvirt.conf
-+# mechanism in /etc/sasl/libvirt.conf
- #auth_tcp = "sasl"
-
- # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.0.0.orig/daemon/Makefile.am libvirt-4.0.0/daemon/Makefile.am
---- libvirt-4.0.0.orig/daemon/Makefile.am 2018-01-24 11:43:38.146588228 +0000
-+++ libvirt-4.0.0/daemon/Makefile.am 2018-01-24 11:44:02.010586806 +0000
-@@ -477,13 +477,13 @@ POD2MAN = pod2man -c "Virtualization Sup
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
- install-data-sasl:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
-- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- uninstall-data-sasl:
-- rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-- rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
-+ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-+ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- else ! WITH_SASL
- install-data-sasl:
- uninstall-data-sasl:
-diff -urp libvirt-4.0.0.orig/daemon/Makefile.in libvirt-4.0.0/daemon/Makefile.in
---- libvirt-4.0.0.orig/daemon/Makefile.in 2018-01-24 11:43:38.146588228 +0000
-+++ libvirt-4.0.0/daemon/Makefile.in 2018-01-24 11:44:02.010586806 +0000
-@@ -2941,13 +2941,13 @@ admin_dispatch.h: $(top_srcdir)/src/rpc/
- # This is needed for clients too, so can't wrap in
- # the WITH_LIBVIRTD conditional
- @WITH_SASL_TRUE@install-data-sasl:
--@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
--@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- @WITH_SASL_TRUE@uninstall-data-sasl:
--@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
--@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl2/ || :
-+@WITH_SASL_TRUE@ rm -f $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-+@WITH_SASL_TRUE@ rmdir $(DESTDIR)$(sysconfdir)/sasl/ || :
- @WITH_SASL_FALSE@install-data-sasl:
- @WITH_SASL_FALSE@uninstall-data-sasl:
-
-diff -urp libvirt-4.0.0.orig/docs/auth.html libvirt-4.0.0/docs/auth.html
---- libvirt-4.0.0.orig/docs/auth.html 2018-01-24 11:43:38.029588235 +0000
-+++ libvirt-4.0.0/docs/auth.html 2018-01-24 11:44:02.011586806 +0000
-@@ -338,7 +338,7 @@ to turn on SASL auth in these listeners.
- <p>
- Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
- config change is rquired to enable plain password auth. This is done by
--editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
- parameter to <code>scram-sha-1</code>.
- </p>
- <p>
-diff -urp libvirt-4.0.0.orig/docs/auth.html.in libvirt-4.0.0/docs/auth.html.in
---- libvirt-4.0.0.orig/docs/auth.html.in 2018-01-24 11:43:38.033588235 +0000
-+++ libvirt-4.0.0/docs/auth.html.in 2018-01-24 11:44:02.011586806 +0000
-@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners.
+diff -ur libvirt-6.1.0.orig/docs/auth.html.in libvirt-6.1.0/docs/auth.html.in
+--- libvirt-6.1.0.orig/docs/auth.html.in 2020-03-06 09:47:34.102000000 +0100
++++ libvirt-6.1.0/docs/auth.html.in 2020-03-06 09:48:38.900000000 +0100
+@@ -275,7 +275,7 @@
<p>
Since the libvirt SASL config file defaults to using GSSAPI (Kerberos), a
- config change is rquired to enable plain password auth. This is done by
+ config change is required to enable plain password auth. This is done by
-editting <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
parameter to <code>scram-sha-1</code>.
</p>
<p>
-diff -urp libvirt-4.0.0.orig/libvirt.spec libvirt-4.0.0/libvirt.spec
---- libvirt-4.0.0.orig/libvirt.spec 2018-01-24 11:43:38.090588232 +0000
-+++ libvirt-4.0.0/libvirt.spec 2018-01-24 11:44:02.011586806 +0000
-@@ -2106,7 +2106,7 @@ exit 0
-
- %{_datadir}/libvirt/test-screenshot.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
+diff -ur libvirt-6.1.0.orig/src/Makefile.in libvirt-6.1.0/src/Makefile.in
+--- libvirt-6.1.0.orig/src/Makefile.in 2020-03-06 09:47:34.051000000 +0100
++++ libvirt-6.1.0/src/Makefile.in 2020-03-06 09:47:52.660000000 +0100
+@@ -6273,7 +6273,7 @@
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-4.0.0.orig/libvirt.spec.in libvirt-4.0.0/libvirt.spec.in
---- libvirt-4.0.0.orig/libvirt.spec.in 2018-01-24 11:43:38.089588232 +0000
-+++ libvirt-4.0.0/libvirt.spec.in 2018-01-24 11:44:02.011586806 +0000
-@@ -2106,7 +2106,7 @@ exit 0
-
- %{_datadir}/libvirt/test-screenshot.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-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 11:43:38.123588230 +0000
-+++ libvirt-4.0.0/src/qemu/qemu.conf 2018-01-24 11:44:02.012586806 +0000
-@@ -129,18 +129,18 @@
+ # This is needed for clients too, so can't wrap in
+ # the WITH_LIBVIRTD conditional
+-@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2
++@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl
+ LIBVIRTD_UNIT_VARS = \
+ $(COMMON_UNIT_VARS) \
+ -e 's|[@]name[@]|Libvirt|g' \
+diff -ur libvirt-6.1.0.orig/src/qemu/qemu.conf libvirt-6.1.0/src/qemu/qemu.conf
+--- libvirt-6.1.0.orig/src/qemu/qemu.conf 2020-03-06 09:47:34.078000000 +0100
++++ libvirt-6.1.0/src/qemu/qemu.conf 2020-03-06 09:47:52.660000000 +0100
+@@ -135,18 +135,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
#
# QEMU implements an extension for providing audio over a VNC connection,
-@@ -205,17 +205,17 @@
+@@ -211,17 +211,17 @@
# Enable use of SASL encryption on the SPICE server. This requires
# a SPICE client which supports the SASL protocol extension.
#
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -urp libvirt-4.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.0.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-4.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-01-24 11:43:38.123588230 +0000
-+++ libvirt-4.0.0/src/qemu/test_libvirtd_qemu.aug.in 2018-01-24 11:44:02.012586806 +0000
-@@ -12,7 +12,7 @@ module Test_libvirtd_qemu =
+diff -ur libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-6.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2020-03-06 09:47:34.077000000 +0100
++++ libvirt-6.1.0/src/qemu/test_libvirtd_qemu.aug.in 2020-03-06 09:47:52.661000000 +0100
+@@ -13,7 +13,7 @@
{ "vnc_tls_x509_verify" = "1" }
{ "vnc_password" = "XYZ12345" }
{ "vnc_sasl" = "1" }
{ "vnc_allow_host_audio" = "0" }
{ "spice_listen" = "0.0.0.0" }
{ "spice_tls" = "1" }
-@@ -20,7 +20,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@
{ "spice_auto_unix_socket" = "1" }
{ "spice_password" = "XYZ12345" }
{ "spice_sasl" = "1" }
{ "chardev_tls" = "1" }
{ "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
{ "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-24 11:43:39.724588134 +0000
-+++ libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-24 11:57:36.684538248 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-6.1.0.orig/src/remote/Makefile.inc.am libvirt-6.1.0/src/remote/Makefile.inc.am
+--- libvirt-6.1.0.orig/src/remote/Makefile.inc.am 2020-03-06 09:47:34.063000000 +0100
++++ libvirt-6.1.0/src/remote/Makefile.inc.am 2020-03-06 09:47:52.661000000 +0100
+@@ -382,7 +382,7 @@
+ # This is needed for clients too, so can't wrap in
+ # the WITH_LIBVIRTD conditional
+ if WITH_SASL
+-sasldir = $(sysconfdir)/sasl2
++sasldir = $(sysconfdir)/sasl
+
+ install-sasl:
+ $(MKDIR_P) $(DESTDIR)$(sasldir)
+diff -ur libvirt-6.1.0.orig/src/remote/libvirtd.conf.in libvirt-6.1.0/src/remote/libvirtd.conf.in
+--- libvirt-6.1.0.orig/src/remote/libvirtd.conf.in 2020-03-06 09:47:34.063000000 +0100
++++ libvirt-6.1.0/src/remote/libvirtd.conf.in 2020-03-06 09:47:52.661000000 +0100
+@@ -134,7 +134,7 @@
+ # the network providing auth (eg, TLS/x509 certificates)
+ #
+ # - sasl: use SASL infrastructure. The actual auth scheme is then
+-# controlled from @sysconfdir@/sasl2/libvirt.conf. For the TCP
++# controlled from @sysconfdir@/sasl/libvirt.conf. For the TCP
+ # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
+ # For non-TCP or TLS sockets, any scheme is allowed.
+ #
+@@ -166,7 +166,7 @@
+ # If you don't enable SASL, then all TCP traffic is cleartext.
+ # Don't do this outside of a dev/test scenario. For real world
+ # use, always enable SASL and use the GSSAPI or DIGEST-MD5
+-# mechanism in @sysconfdir@/sasl2/libvirt.conf
++# mechanism in @sysconfdir@/sasl/libvirt.conf
+ #auth_tcp = "sasl"
+
+ # Change the authentication scheme for TLS sockets.
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2020-03-06 09:47:33.713000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2020-03-06 09:47:52.661000000 +0100
+@@ -6,7 +6,7 @@
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
+ QEMU_AUDIO_DRV=spice \
+ /usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-diff -urp libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-4.0.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-24 11:43:39.724588134 +0000
-+++ libvirt-4.0.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-24 11:57:57.508537006 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2020-03-06 09:47:33.722000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2020-03-06 09:47:52.662000000 +0100
+@@ -6,7 +6,7 @@
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
+ /usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-24 11:43:39.747588133 +0000
-+++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-24 11:58:03.869536627 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2020-03-06 09:47:33.722000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2020-03-06 09:47:52.662000000 +0100
+@@ -6,7 +6,7 @@
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
- QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-24 11:43:39.747588133 +0000
-+++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-24 11:58:00.876536806 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+ QEMU_AUDIO_DRV=none \
+ /usr/bin/qemu-system-i386 \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2020-03-06 09:47:33.713000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2020-03-06 09:47:52.663000000 +0100
+@@ -6,7 +6,7 @@
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
+ /usr/bin/qemu-system-i386 \
-name QEMUGuest1 \
-diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-4.0.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-24 11:43:39.747588133 +0000
-+++ libvirt-4.0.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-24 11:58:06.308536482 +0000
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2020-03-06 09:47:33.718000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2020-03-06 09:47:52.663000000 +0100
+@@ -6,7 +6,7 @@
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-diff -urp libvirt-4.0.0.orig/tests/qemuxml2argvtest.c libvirt-4.0.0/tests/qemuxml2argvtest.c
---- libvirt-4.0.0.orig/tests/qemuxml2argvtest.c 2018-01-24 11:43:38.900588183 +0000
-+++ libvirt-4.0.0/tests/qemuxml2argvtest.c 2018-01-24 11:44:07.107586502 +0000
-@@ -1092,7 +1092,7 @@ mymain(void)
+ /usr/bin/qemu-system-i386 \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-6.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2020-03-06 09:47:33.719000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2020-03-06 09:47:52.664000000 +0100
+@@ -6,7 +6,7 @@
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
+-SASL_CONF_PATH=/root/.sasl2 \
++SASL_CONF_PATH=/root/.sasl \
+ QEMU_AUDIO_DRV=none \
+ /usr/bin/qemu-system-i386 \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-6.1.0.orig/tests/qemuxml2argvtest.c libvirt-6.1.0/tests/qemuxml2argvtest.c
+--- libvirt-6.1.0.orig/tests/qemuxml2argvtest.c 2020-03-06 09:47:33.741000000 +0100
++++ libvirt-6.1.0/tests/qemuxml2argvtest.c 2020-03-06 09:47:52.665000000 +0100
+@@ -1197,7 +1197,7 @@
driver.config->vncSASL = 1;
VIR_FREE(driver.config->vncSASLdir);
-- ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl2"));
-+ ignore_value(VIR_STRDUP(driver.config->vncSASLdir, "/root/.sasl"));
+- driver.config->vncSASLdir = g_strdup("/root/.sasl2");
++ driver.config->vncSASLdir = g_strdup("/root/.sasl");
DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->vncTLS = 1;
driver.config->vncTLSx509verify = 1;
-@@ -1116,7 +1116,7 @@ mymain(void)
+@@ -1227,7 +1227,7 @@
DO_TEST("graphics-spice-no-args",
QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
driver.config->spiceSASL = 1;
-- ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl2"));
-+ ignore_value(VIR_STRDUP(driver.config->spiceSASLdir, "/root/.sasl"));
+- driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
++ driver.config->spiceSASLdir = g_strdup("/root/.sasl");
DO_TEST("graphics-spice-sasl",
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-4.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.0.0/tests/virconfdata/libvirtd.conf
---- libvirt-4.0.0.orig/tests/virconfdata/libvirtd.conf 2018-01-24 11:43:38.873588185 +0000
-+++ libvirt-4.0.0/tests/virconfdata/libvirtd.conf 2018-01-24 11:44:07.107586502 +0000
-@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
+diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-6.1.0/tests/virconfdata/libvirtd.conf
+--- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.conf 2020-03-06 09:47:33.909000000 +0100
++++ libvirt-6.1.0/tests/virconfdata/libvirtd.conf 2020-03-06 09:47:52.665000000 +0100
+@@ -91,7 +91,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
# socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
# For non-TCP or TLS sockets, any scheme is allowed.
#
-@@ -139,7 +139,7 @@ auth_unix_rw = "none"
+@@ -122,7 +122,7 @@
# If you don't enable SASL, then all TCP traffic is cleartext.
# Don't do this outside of a dev/test scenario. For real world
# use, always enable SASL and use the GSSAPI or DIGEST-MD5
auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-4.0.0.orig/tests/virconfdata/libvirtd.out libvirt-4.0.0/tests/virconfdata/libvirtd.out
---- libvirt-4.0.0.orig/tests/virconfdata/libvirtd.out 2018-01-24 11:43:38.873588185 +0000
-+++ libvirt-4.0.0/tests/virconfdata/libvirtd.out 2018-01-24 11:44:07.108586502 +0000
-@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
+diff -ur libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out libvirt-6.1.0/tests/virconfdata/libvirtd.out
+--- libvirt-6.1.0.orig/tests/virconfdata/libvirtd.out 2020-03-06 09:47:33.909000000 +0100
++++ libvirt-6.1.0/tests/virconfdata/libvirtd.out 2020-03-06 09:47:52.665000000 +0100
+@@ -73,7 +73,7 @@
# the network providing auth (eg, TLS/x509 certificates)
#
# - sasl: use SASL infrastructure. The actual auth scheme is then
# socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
# For non-TCP or TLS sockets, any scheme is allowed.
#
-@@ -116,7 +116,7 @@ auth_unix_rw = "none"
+@@ -102,7 +102,7 @@
# If you don't enable SASL, then all TCP traffic is cleartext.
# Don't do this outside of a dev/test scenario. For real world
# use, always enable SASL and use the GSSAPI or DIGEST-MD5