- 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 /etc/sasl2/libvirt.conf to set the mech_list
-+editting /etc/sasl/libvirt.conf to set the mech_list
- parameter to scram-sha-1.
-
-diff -urp libvirt-4.2.0.orig/docs/auth.html.in libvirt-4.2.0/docs/auth.html.in ---- libvirt-4.2.0.orig/docs/auth.html.in 2018-04-12 12:41:58.331580941 +0000 -+++ libvirt-4.2.0/docs/auth.html.in 2018-04-12 12:42:15.268580750 +0000 -@@ -267,7 +267,7 @@ to turn on SASL auth in these listeners. -
- 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 /etc/sasl2/libvirt.conf to set the mech_list
-+editting /etc/sasl/libvirt.conf to set the mech_list
- parameter to scram-sha-1.
-
-diff -urp libvirt-4.2.0.orig/libvirt.spec libvirt-4.2.0/libvirt.spec ---- libvirt-4.2.0.orig/libvirt.spec 2018-04-12 12:41:58.347580941 +0000 -+++ libvirt-4.2.0/libvirt.spec 2018-04-12 12:42:15.268580750 +0000 -@@ -2124,7 +2124,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.2.0.orig/libvirt.spec.in libvirt-4.2.0/libvirt.spec.in ---- libvirt-4.2.0.orig/libvirt.spec.in 2018-04-12 12:41:58.346580941 +0000 -+++ libvirt-4.2.0/libvirt.spec.in 2018-04-12 12:42:15.268580750 +0000 -@@ -2124,7 +2124,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.2.0.orig/src/Makefile.in libvirt-4.2.0/src/Makefile.in ---- libvirt-4.2.0.orig/src/Makefile.in 2018-04-12 12:41:58.401580940 +0000 -+++ libvirt-4.2.0/src/Makefile.in 2018-04-12 12:42:15.272580750 +0000 -@@ -13098,13 +13098,13 @@ lxc/lxc_controller_dispatch.h: $(srcdir) - # 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.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:41:58.380580940 +0000 -+++ libvirt-4.2.0/src/qemu/qemu.conf 2018-04-12 12:42:15.272580750 +0000 -@@ -129,18 +129,18 @@ +diff -ur libvirt-10.2.0.orig/docs/auth.rst libvirt-10.2.0/docs/auth.rst +--- libvirt-10.2.0.orig/docs/auth.rst 2024-04-03 17:45:03.261111129 +0200 ++++ libvirt-10.2.0/docs/auth.rst 2024-04-03 17:45:24.393393683 +0200 +@@ -225,7 +225,7 @@ + + Since the libvirt SASL config file defaults to using ``GSSAPI`` (Kerberos), a + config change is required to enable plain password auth. This is done by +-editing ``/etc/sasl2/libvirt.conf`` to set the ``mech_list`` ++editing ``/etc/sasl/libvirt.conf`` to set the ``mech_list`` + parameter to ``scram-sha-256``. + + **Note:** previous versions of libvirt suggested ``DIGEST-MD5`` and +diff -ur libvirt-10.2.0.orig/src/qemu/qemu.conf.in libvirt-10.2.0/src/qemu/qemu.conf.in +--- libvirt-10.2.0.orig/src/qemu/qemu.conf.in 2024-04-03 17:45:03.365112520 +0200 ++++ libvirt-10.2.0/src/qemu/qemu.conf.in 2024-04-03 17:45:24.457394538 +0200 +@@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -92,7 +35,7 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -205,17 +205,17 @@ +@@ -217,17 +217,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -113,10 +56,10 @@ diff -urp libvirt-4.2.0.orig/src/qemu/qemu.conf libvirt-4.2.0/src/qemu/qemu.conf # Enable use of TLS encryption on the chardev TCP transports. # -diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.0/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2018-04-12 12:41:58.380580940 +0000 -+++ libvirt-4.2.0/src/qemu/test_libvirtd_qemu.aug.in 2018-04-12 12:42:15.273580750 +0000 -@@ -12,7 +12,7 @@ module Test_libvirtd_qemu = +diff -ur libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-10.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2024-04-03 17:45:03.369112573 +0200 ++++ libvirt-10.2.0/src/qemu/test_libvirtd_qemu.aug.in 2024-04-03 17:45:24.457394538 +0200 +@@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } { "vnc_sasl" = "1" } @@ -125,7 +68,7 @@ diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.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" } @@ -134,133 +77,118 @@ diff -urp libvirt-4.2.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-4.2.0/sr { "chardev_tls" = "1" } { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } { "chardev_tls_x509_verify" = "1" } -diff -urp libvirt-4.2.0.orig/src/remote/libvirtd.conf libvirt-4.2.0/src/remote/libvirtd.conf ---- libvirt-4.2.0.orig/src/remote/libvirtd.conf 2018-04-12 12:41:58.382580940 +0000 -+++ libvirt-4.2.0/src/remote/libvirtd.conf 2018-04-12 12:42:15.273580750 +0000 -@@ -123,7 +123,7 @@ +diff -ur libvirt-10.2.0.orig/src/remote/libvirtd.conf.in libvirt-10.2.0/src/remote/libvirtd.conf.in +--- libvirt-10.2.0.orig/src/remote/libvirtd.conf.in 2024-04-03 17:45:03.369112573 +0200 ++++ libvirt-10.2.0/src/remote/libvirtd.conf.in 2024-04-03 17:45:24.457394538 +0200 +@@ -140,7 +140,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 @@ +@@ -190,7 +190,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-4.2.0.orig/src/remote/Makefile.inc.am libvirt-4.2.0/src/remote/Makefile.inc.am ---- libvirt-4.2.0.orig/src/remote/Makefile.inc.am 2018-04-12 12:41:58.380580940 +0000 -+++ libvirt-4.2.0/src/remote/Makefile.inc.am 2018-04-12 12:43:43.861579753 +0000 -@@ -243,13 +243,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.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args ---- libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-04-12 12:41:58.691580937 +0000 -+++ libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args 2018-04-12 12:42:15.273580750 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --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.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-tls.args ---- libvirt-4.2.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-04-12 12:41:58.691580937 +0000 -+++ libvirt-4.2.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2018-04-12 12:42:15.273580750 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --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.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-spice-sasl.args ---- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-04-12 12:41:58.722580936 +0000 -+++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-spice-sasl.args 2018-04-12 12:42:15.273580750 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --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.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args ---- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-04-12 12:41:58.722580936 +0000 -+++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2018-04-12 12:42:15.273580750 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --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.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-tls.args ---- libvirt-4.2.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-04-12 12:41:58.722580936 +0000 -+++ libvirt-4.2.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2018-04-12 12:42:15.273580750 +0000 -@@ -3,7 +3,7 @@ PATH=/bin \ - HOME=/home/test \ - USER=test \ - LOGNAME=test \ --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.2.0.orig/tests/qemuxml2argvtest.c libvirt-4.2.0/tests/qemuxml2argvtest.c ---- libvirt-4.2.0.orig/tests/qemuxml2argvtest.c 2018-04-12 12:41:58.410580940 +0000 -+++ libvirt-4.2.0/tests/qemuxml2argvtest.c 2018-04-12 12:42:15.274580750 +0000 -@@ -1098,7 +1098,7 @@ mymain(void) - - 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")); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); - driver.config->vncTLS = 1; - driver.config->vncTLSx509verify = 1; -@@ -1122,7 +1122,7 @@ mymain(void) - 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")); - DO_TEST("graphics-spice-sasl", - QEMU_CAPS_SPICE, - QEMU_CAPS_DEVICE_QXL); -diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.0/tests/virconfdata/libvirtd.conf ---- libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf 2018-04-12 12:41:58.827580935 +0000 -+++ libvirt-4.2.0/tests/virconfdata/libvirtd.conf 2018-04-12 12:42:15.274580750 +0000 -@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" +diff -ur libvirt-10.2.0.orig/src/remote/meson.build libvirt-10.2.0/src/remote/meson.build +--- libvirt-10.2.0.orig/src/remote/meson.build 2024-04-03 17:45:03.369112573 +0200 ++++ libvirt-10.2.0/src/remote/meson.build 2024-04-03 17:45:24.457394538 +0200 +@@ -328,7 +328,7 @@ + if conf.has('WITH_SASL') + install_data( + 'libvirtd.sasl', +- install_dir: sysconfdir / 'sasl2', ++ install_dir: sysconfdir / 'sasl', + rename: [ 'libvirt.conf' ], + ) + endif +diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args +--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2024-04-03 17:45:03.593115568 +0200 ++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-spice-sasl.x86_64-latest.args 2024-04-03 17:47:10.346810356 +0200 +@@ -6,7 +6,7 @@ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args +--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args 2024-04-03 17:45:03.597115621 +0200 ++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-sasl.x86_64-latest.args 2024-04-03 17:47:02.230701838 +0200 +@@ -6,7 +6,7 @@ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2024-04-03 17:45:03.597115621 +0200 ++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2024-04-03 17:47:06.658761044 +0200 +@@ -6,7 +6,7 @@ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args 2024-04-03 17:45:03.597115621 +0200 ++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls-secret.x86_64-latest.args 2024-04-03 17:47:16.594893897 +0200 +@@ -6,7 +6,7 @@ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-10.2.0.orig/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args 2024-04-03 17:45:03.597115621 +0200 ++++ libvirt-10.2.0/tests/qemuxmlconfdata/graphics-vnc-tls.x86_64-latest.args 2024-04-03 17:47:13.522852821 +0200 +@@ -6,7 +6,7 @@ + XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ + XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ + XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +-SASL_CONF_PATH=/etc/sasl2 \ ++SASL_CONF_PATH=/etc/sasl \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-10.2.0.orig/tests/testutilsqemu.c libvirt-10.2.0/tests/testutilsqemu.c +--- libvirt-10.2.0.orig/tests/testutilsqemu.c 2024-04-03 17:45:03.705117066 +0200 ++++ libvirt-10.2.0/tests/testutilsqemu.c 2024-04-03 17:45:28.901453959 +0200 +@@ -387,9 +387,9 @@ + cfg->backupTLSx509certdir = g_strdup("/etc/pki/libvirt-backup"); + + VIR_FREE(cfg->vncSASLdir); +- cfg->vncSASLdir = g_strdup("/etc/sasl2"); ++ cfg->vncSASLdir = g_strdup("/etc/sasl"); + VIR_FREE(cfg->spiceSASLdir); +- cfg->spiceSASLdir = g_strdup("/etc/sasl2"); ++ cfg->spiceSASLdir = g_strdup("/etc/sasl"); + + VIR_FREE(cfg->spicePassword); + cfg->spicePassword = g_strdup("123456"); +diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-10.2.0/tests/virconfdata/libvirtd.conf +--- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.conf 2024-04-03 17:45:03.905119740 +0200 ++++ libvirt-10.2.0/tests/virconfdata/libvirtd.conf 2024-04-03 17:45:28.929454333 +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 +197,7 @@ diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.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 +206,10 @@ diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.conf libvirt-4.2.0/tests auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out libvirt-4.2.0/tests/virconfdata/libvirtd.out ---- libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out 2018-04-12 12:41:58.827580935 +0000 -+++ libvirt-4.2.0/tests/virconfdata/libvirtd.out 2018-04-12 12:42:15.274580750 +0000 -@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" +diff -ur libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out libvirt-10.2.0/tests/virconfdata/libvirtd.out +--- libvirt-10.2.0.orig/tests/virconfdata/libvirtd.out 2024-04-03 17:45:03.905119740 +0200 ++++ libvirt-10.2.0/tests/virconfdata/libvirtd.out 2024-04-03 17:45:28.929454333 +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 +218,7 @@ diff -urp libvirt-4.2.0.orig/tests/virconfdata/libvirtd.out libvirt-4.2.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