-diff -urp libvirt-5.1.0.orig/docs/auth.html libvirt-5.1.0/docs/auth.html
---- libvirt-5.1.0.orig/docs/auth.html 2019-03-23 11:37:08.293000000 +0100
-+++ libvirt-5.1.0/docs/auth.html 2019-03-23 11:37:35.451000000 +0100
-@@ -347,7 +347,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-5.1.0.orig/docs/auth.html.in libvirt-5.1.0/docs/auth.html.in
---- libvirt-5.1.0.orig/docs/auth.html.in 2019-03-23 11:37:08.296000000 +0100
-+++ libvirt-5.1.0/docs/auth.html.in 2019-03-23 11:37:35.451000000 +0100
-@@ -277,7 +277,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-5.1.0.orig/src/Makefile.in libvirt-5.1.0/src/Makefile.in
---- libvirt-5.1.0.orig/src/Makefile.in 2019-03-23 11:37:08.372000000 +0100
-+++ libvirt-5.1.0/src/Makefile.in 2019-03-23 11:38:49.722000000 +0100
-@@ -6226,7 +6226,7 @@ REMOTE_DRIVER_PROTOCOL = \
+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 @@
# 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
- THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD)
- SECDRIVER_CFLAGS = $(am__append_185) $(am__append_187)
- SECDRIVER_LIBS = $(am__append_186) $(am__append_188)
-diff -urp libvirt-5.1.0.orig/src/qemu/qemu.conf libvirt-5.1.0/src/qemu/qemu.conf
---- libvirt-5.1.0.orig/src/qemu/qemu.conf 2019-03-23 11:37:08.358000000 +0100
-+++ libvirt-5.1.0/src/qemu/qemu.conf 2019-03-23 11:37:35.455000000 +0100
+ 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
# Enable use of TLS encryption on the chardev TCP transports.
#
-diff -urp libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.1.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-03-23 11:37:08.358000000 +0100
-+++ libvirt-5.1.0/src/qemu/test_libvirtd_qemu.aug.in 2019-03-23 11:37:35.455000000 +0100
-@@ -13,7 +13,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" }
-@@ -21,7 +21,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-5.1.0.orig/src/remote/libvirtd.conf libvirt-5.1.0/src/remote/libvirtd.conf
---- libvirt-5.1.0.orig/src/remote/libvirtd.conf 2019-03-23 11:37:08.359000000 +0100
-+++ libvirt-5.1.0/src/remote/libvirtd.conf 2019-03-23 11:37:35.455000000 +0100
-@@ -123,7 +123,7 @@
+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 /etc/sasl2/libvirt.conf. For the TCP
-+# controlled from /etc/sasl/libvirt.conf. For the TCP
+-# 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.
#
-@@ -154,7 +154,7 @@
+@@ -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 /etc/sasl2/libvirt.conf
-+# mechanism in /etc/sasl/libvirt.conf
+-# mechanism in @sysconfdir@/sasl2/libvirt.conf
++# mechanism in @sysconfdir@/sasl/libvirt.conf
#auth_tcp = "sasl"
# Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.1.0.orig/src/remote/Makefile.inc.am libvirt-5.1.0/src/remote/Makefile.inc.am
---- libvirt-5.1.0.orig/src/remote/Makefile.inc.am 2019-03-23 11:37:08.358000000 +0100
-+++ libvirt-5.1.0/src/remote/Makefile.inc.am 2019-03-23 11:39:17.701000000 +0100
-@@ -242,7 +242,7 @@ endif WITH_LIBVIRTD
- # 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 -urp libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2019-03-23 11:37:08.489000000 +0100
-+++ libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2019-03-23 11:37:35.455000000 +0100
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+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-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-5.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-03-23 11:37:08.489000000 +0100
-+++ libvirt-5.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-03-23 11:37:35.456000000 +0100
-@@ -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-5.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-03-23 11:37:08.535000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-03-23 11:37:35.456000000 +0100
-@@ -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-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-03-23 11:37:08.535000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-03-23 11:37:35.456000000 +0100
-@@ -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-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-03-23 11:37:08.536000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-03-23 11:37:35.456000000 +0100
-@@ -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-5.1.0.orig/tests/qemuxml2argvtest.c libvirt-5.1.0/tests/qemuxml2argvtest.c
---- libvirt-5.1.0.orig/tests/qemuxml2argvtest.c 2019-03-23 11:37:08.378000000 +0100
-+++ libvirt-5.1.0/tests/qemuxml2argvtest.c 2019-03-23 11:37:35.456000000 +0100
-@@ -1212,7 +1212,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;
-@@ -1244,7 +1244,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-5.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.1.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.1.0.orig/tests/virconfdata/libvirtd.conf 2019-03-23 11:37:09.290000000 +0100
-+++ libvirt-5.1.0/tests/virconfdata/libvirtd.conf 2019-03-23 11:37:35.456000000 +0100
-@@ -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-5.1.0.orig/tests/virconfdata/libvirtd.out libvirt-5.1.0/tests/virconfdata/libvirtd.out
---- libvirt-5.1.0.orig/tests/virconfdata/libvirtd.out 2019-03-23 11:37:09.290000000 +0100
-+++ libvirt-5.1.0/tests/virconfdata/libvirtd.out 2019-03-23 11:37:35.456000000 +0100
-@@ -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
TLD / packages / libvirt.git / blobdiff