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
@@ -10,10 +10,10 @@ diff -urp libvirt-4.1.0.orig/docs/auth.html libvirt-4.1.0/docs/auth.html
parameter to scram-sha-1.
-diff -urp libvirt-4.1.0.orig/docs/auth.html.in libvirt-4.1.0/docs/auth.html.in ---- libvirt-4.1.0.orig/docs/auth.html.in 2017-08-29 08:38:20.000000000 +0000 -+++ libvirt-4.1.0/docs/auth.html.in 2018-03-12 10:51:10.186949975 +0000 -@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners. +diff -ur libvirt-5.5.0.orig/docs/auth.html.in libvirt-5.5.0/docs/auth.html.in +--- libvirt-5.5.0.orig/docs/auth.html.in 2019-07-14 19:23:33.991000000 +0200 ++++ libvirt-5.5.0/docs/auth.html.in 2019-07-14 19:23:54.564000000 +0200 +@@ -277,7 +277,7 @@
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
@@ -22,76 +22,22 @@ diff -urp libvirt-4.1.0.orig/docs/auth.html.in libvirt-4.1.0/docs/auth.html.in
parameter to scram-sha-1.
-diff -urp libvirt-4.1.0.orig/libvirt.spec libvirt-4.1.0/libvirt.spec ---- libvirt-4.1.0.orig/libvirt.spec 2018-03-05 09:00:00.000000000 +0000 -+++ libvirt-4.1.0/libvirt.spec 2018-03-12 10:51:10.199949975 +0000 -@@ -2118,7 +2118,7 @@ exit 0 +diff -ur libvirt-5.5.0.orig/src/Makefile.in libvirt-5.5.0/src/Makefile.in +--- libvirt-5.5.0.orig/src/Makefile.in 2019-07-14 19:23:33.798000000 +0200 ++++ libvirt-5.5.0/src/Makefile.in 2019-07-14 19:23:54.566000000 +0200 +@@ -6723,7 +6723,7 @@ - %{_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.1.0.orig/libvirt.spec.in libvirt-4.1.0/libvirt.spec.in ---- libvirt-4.1.0.orig/libvirt.spec.in 2018-02-28 16:48:15.000000000 +0000 -+++ libvirt-4.1.0/libvirt.spec.in 2018-03-12 10:51:10.199949975 +0000 -@@ -2118,7 +2118,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.1.0.orig/src/Makefile.am libvirt-4.1.0/src/Makefile.am ---- libvirt-4.1.0.orig/src/Makefile.am 2018-03-05 08:57:31.000000000 +0000 -+++ libvirt-4.1.0/src/Makefile.am 2018-03-12 10:52:52.804948819 +0000 -@@ -2300,13 +2300,13 @@ endif ! WITH_LIBVIRTD - # the WITH_LIBVIRTD conditional - if WITH_SASL - install-sasl: -- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ -+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/ - $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ -- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf -+ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf - - uninstall-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-sasl: - uninstall-sasl: -diff -urp libvirt-4.1.0.orig/src/Makefile.in libvirt-4.1.0/src/Makefile.in ---- libvirt-4.1.0.orig/src/Makefile.in 2018-03-05 08:59:17.000000000 +0000 -+++ libvirt-4.1.0/src/Makefile.in 2018-03-12 10:53:22.637948484 +0000 -@@ -12931,13 +12931,13 @@ uninstall-sysconfig: # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional - @WITH_SASL_TRUE@install-sasl: --@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/ -+@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/ - @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/remote/libvirtd.sasl \ --@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf -+@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf - - @WITH_SASL_TRUE@uninstall-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-sasl: - @WITH_SASL_FALSE@uninstall-sasl: - -diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf ---- libvirt-4.1.0.orig/src/qemu/qemu.conf 2018-01-12 14:48:37.000000000 +0000 -+++ libvirt-4.1.0/src/qemu/qemu.conf 2018-03-12 10:51:10.199949975 +0000 -@@ -129,18 +129,18 @@ +-@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl2 ++@WITH_SASL_TRUE@sasldir = $(sysconfdir)/sasl + THREAD_LIBS = $(LIB_PTHREAD) $(LTLIBMULTITHREAD) + SECDRIVER_CFLAGS = $(am__append_191) $(am__append_193) + SECDRIVER_LIBS = $(am__append_192) $(am__append_194) +diff -ur libvirt-5.5.0.orig/src/qemu/qemu.conf libvirt-5.5.0/src/qemu/qemu.conf +--- libvirt-5.5.0.orig/src/qemu/qemu.conf 2019-07-14 19:23:33.825000000 +0200 ++++ libvirt-5.5.0/src/qemu/qemu.conf 2019-07-14 19:23:54.566000000 +0200 +@@ -135,18 +135,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -113,7 +59,7 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf # 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. # @@ -134,10 +80,10 @@ diff -urp libvirt-4.1.0.orig/src/qemu/qemu.conf libvirt-4.1.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-09-29 07:30:58.000000000 +0000 -+++ libvirt-4.1.0/src/qemu/test_libvirtd_qemu.aug.in 2018-03-12 10:51:10.199949975 +0000 -@@ -12,7 +12,7 @@ module Test_libvirtd_qemu = +diff -ur libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-5.5.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2019-07-14 19:23:33.824000000 +0200 ++++ libvirt-5.5.0/src/qemu/test_libvirtd_qemu.aug.in 2019-07-14 19:23:54.566000000 +0200 +@@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } { "vnc_sasl" = "1" } @@ -146,7 +92,7 @@ diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/sr { "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" } @@ -155,10 +101,10 @@ diff -urp libvirt-4.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.1.0/sr { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/libvirtd.conf ---- libvirt-4.1.0.orig/src/remote/libvirtd.conf 2018-02-26 09:02:18.000000000 +0000 -+++ libvirt-4.1.0/src/remote/libvirtd.conf 2018-03-12 10:52:04.539949363 +0000 -@@ -123,7 +123,7 @@ +diff -ur libvirt-5.5.0.orig/src/remote/libvirtd.conf libvirt-5.5.0/src/remote/libvirtd.conf +--- libvirt-5.5.0.orig/src/remote/libvirtd.conf 2019-07-14 19:23:33.810000000 +0200 ++++ libvirt-5.5.0/src/remote/libvirtd.conf 2019-07-14 19:23:54.566000000 +0200 +@@ -101,7 +101,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -167,7 +113,7 @@ diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/l # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -154,7 +154,7 @@ +@@ -132,7 +132,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 @@ -176,70 +122,94 @@ diff -urp libvirt-4.1.0.orig/src/remote/libvirtd.conf libvirt-4.1.0/src/remote/l #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args ---- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000 -+++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-03-12 10:51:10.199949975 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ +diff -ur libvirt-5.5.0.orig/src/remote/Makefile.inc.am libvirt-5.5.0/src/remote/Makefile.inc.am +--- libvirt-5.5.0.orig/src/remote/Makefile.inc.am 2019-07-14 19:23:33.812000000 +0200 ++++ libvirt-5.5.0/src/remote/Makefile.inc.am 2019-07-14 19:23:54.567000000 +0200 +@@ -244,7 +244,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-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args +--- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-07-14 19:23:33.362000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-07-14 19:23:59.923000000 +0200 +@@ -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 \ + QEMU_AUDIO_DRV=spice \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args ---- libvirt-4.1.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000 -+++ libvirt-4.1.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-03-12 10:51:10.199949975 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ +diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args +--- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-07-14 19:23:33.375000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2019-07-14 19:23:59.923000000 +0200 +@@ -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.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args ---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-01-12 14:48:37.000000000 +0000 -+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-03-12 10:51:10.200949975 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ +diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args +--- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-07-14 19:23:33.361000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-07-14 19:23:59.923000000 +0200 +@@ -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 \ + QEMU_AUDIO_DRV=none \ /usr/bin/qemu-system-i686 \ -name QEMUGuest1 \ -diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args ---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-01-12 14:48:37.000000000 +0000 -+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-03-12 10:51:10.200949975 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ +diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-07-14 19:23:33.375000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2019-07-14 19:26:27.145000000 +0200 +@@ -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.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args ---- libvirt-4.1.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-01-12 14:48:37.000000000 +0000 -+++ libvirt-4.1.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-03-12 10:51:10.200949975 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ + -name guest=QEMUGuest1,debug-threads=on \ +diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args +--- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-07-14 19:23:33.369000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args 2019-07-14 19:26:23.287000000 +0200 +@@ -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.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxml2argvtest.c ---- libvirt-4.1.0.orig/tests/qemuxml2argvtest.c 2018-02-26 09:02:18.000000000 +0000 -+++ libvirt-4.1.0/tests/qemuxml2argvtest.c 2018-03-12 10:51:10.207949975 +0000 -@@ -1097,7 +1097,7 @@ mymain(void) + -name guest=QEMUGuest1,debug-threads=on \ +diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-5.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-07-14 19:23:33.371000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2019-07-14 19:26:19.952000000 +0200 +@@ -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 guest=QEMUGuest1,debug-threads=on \ +diff -ur libvirt-5.5.0.orig/tests/qemuxml2argvtest.c libvirt-5.5.0/tests/qemuxml2argvtest.c +--- libvirt-5.5.0.orig/tests/qemuxml2argvtest.c 2019-07-14 19:23:33.401000000 +0200 ++++ libvirt-5.5.0/tests/qemuxml2argvtest.c 2019-07-14 19:23:59.924000000 +0200 +@@ -1155,7 +1155,7 @@ driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -248,7 +218,7 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1121,7 +1121,7 @@ mymain(void) +@@ -1187,7 +1187,7 @@ DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceSASL = 1; @@ -257,10 +227,10 @@ diff -urp libvirt-4.1.0.orig/tests/qemuxml2argvtest.c libvirt-4.1.0/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_QXL); -diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests/virconfdata/libvirtd.conf ---- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 07:32:36.000000000 +0000 -+++ libvirt-4.1.0/tests/virconfdata/libvirtd.conf 2018-03-12 10:51:10.218949974 +0000 -@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" +diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.5.0/tests/virconfdata/libvirtd.conf +--- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.conf 2019-07-14 19:23:33.602000000 +0200 ++++ libvirt-5.5.0/tests/virconfdata/libvirtd.conf 2019-07-14 19:23:59.924000000 +0200 +@@ -91,7 +91,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -269,7 +239,7 @@ diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests # 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 @@ -278,10 +248,10 @@ diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.1.0/tests auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out libvirt-4.1.0/tests/virconfdata/libvirtd.out ---- libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out 2017-10-30 07:32:36.000000000 +0000 -+++ libvirt-4.1.0/tests/virconfdata/libvirtd.out 2018-03-12 10:51:10.218949974 +0000 -@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" +diff -ur libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out libvirt-5.5.0/tests/virconfdata/libvirtd.out +--- libvirt-5.5.0.orig/tests/virconfdata/libvirtd.out 2019-07-14 19:23:33.602000000 +0200 ++++ libvirt-5.5.0/tests/virconfdata/libvirtd.out 2019-07-14 19:23:59.924000000 +0200 +@@ -73,7 +73,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -290,7 +260,7 @@ diff -urp libvirt-4.1.0.orig/tests/virconfdata/libvirtd.out libvirt-4.1.0/tests/ # 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