X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=1626d1d3bde2545b9c63bc957ecddee92a567280;hp=d8b88242a5470f2a60681cd54a6bbb6d2a84ca2e;hb=69c354bc3e587972c43559ff76dfe363a23f26cb;hpb=a715fdd0d01d04b93ace37e5754fbfeb31fad8ef diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index d8b8824..1626d1d 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,97 +1,19 @@ -diff -urp libvirt-4.1.0.orig/docs/auth.html libvirt-4.1.0/docs/auth.html ---- libvirt-4.1.0.orig/docs/auth.html 2018-02-26 09:05:10.000000000 +0000 -+++ libvirt-4.1.0/docs/auth.html 2018-03-12 10:51:10.186949975 +0000 -@@ -338,7 +338,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.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. -

- 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.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 - - %{_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 @@ +diff -ur libvirt-8.4.0.orig/docs/auth.rst libvirt-8.4.0/docs/auth.rst +--- libvirt-8.4.0.orig/docs/auth.rst 2022-06-02 23:58:08.077490237 +0200 ++++ libvirt-8.4.0/docs/auth.rst 2022-06-02 23:58:27.936533169 +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-8.4.0.orig/src/qemu/qemu.conf.in libvirt-8.4.0/src/qemu/qemu.conf.in +--- libvirt-8.4.0.orig/src/qemu/qemu.conf.in 2022-06-02 23:58:08.164490425 +0200 ++++ libvirt-8.4.0/src/qemu/qemu.conf.in 2022-06-03 00:01:05.398849381 +0200 +@@ -141,18 +141,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -113,7 +35,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 @@ +@@ -217,17 +217,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -134,10 +56,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-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-8.4.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2022-06-02 23:58:08.170490438 +0200 ++++ libvirt-8.4.0/src/qemu/test_libvirtd_qemu.aug.in 2022-06-02 23:58:30.521538761 +0200 +@@ -13,7 +13,7 @@ { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } { "vnc_sasl" = "1" } @@ -146,7 +68,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,112 +77,124 @@ 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-8.4.0.orig/src/remote/libvirtd.conf.in libvirt-8.4.0/src/remote/libvirtd.conf.in +--- libvirt-8.4.0.orig/src/remote/libvirtd.conf.in 2022-06-02 23:58:08.171490440 +0200 ++++ libvirt-8.4.0/src/remote/libvirtd.conf.in 2022-06-02 23:58:30.521538761 +0200 +@@ -136,7 +136,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 @@ +@@ -186,7 +186,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.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-8.4.0.orig/src/remote/meson.build libvirt-8.4.0/src/remote/meson.build +--- libvirt-8.4.0.orig/src/remote/meson.build 2022-06-02 23:58:08.171490440 +0200 ++++ libvirt-8.4.0/src/remote/meson.build 2022-06-02 23:58:30.522538764 +0200 +@@ -302,7 +302,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-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-06-02 23:58:08.323490769 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-spice-sasl.x86_64-latest.args 2022-06-02 23:58:30.522538764 +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/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 \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-sasl.x86_64-latest.args 2022-06-02 23:58:31.535540952 +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 \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-5.2.0.args 2022-06-02 23:58:31.535540952 +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 \ - /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 \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args 2022-06-02 23:58:31.536540954 +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 \ + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args +--- libvirt-8.4.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-06-02 23:58:08.324490771 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args 2022-06-02 23:58:32.239542466 +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) + /usr/bin/qemu-system-x86_64 \ + -name guest=QEMUGuest1,debug-threads=on \ + -S \ +diff -ur libvirt-8.4.0.orig/tests/qemuxml2argvtest.c libvirt-8.4.0/tests/qemuxml2argvtest.c +--- libvirt-8.4.0.orig/tests/qemuxml2argvtest.c 2022-06-02 23:58:08.469491084 +0200 ++++ libvirt-8.4.0/tests/qemuxml2argvtest.c 2022-06-02 23:59:10.540619907 +0200 +@@ -1509,7 +1509,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")); - DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA); +- driver.config->vncSASLdir = g_strdup("/root/.sasl2"); ++ driver.config->vncSASLdir = g_strdup("/root/.sasl"); + DO_TEST_CAPS_LATEST("graphics-vnc-sasl"); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -1121,7 +1121,7 @@ mymain(void) - DO_TEST("graphics-spice-no-args", - QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA); +@@ -1531,7 +1531,7 @@ + DO_TEST_CAPS_LATEST("graphics-spice"); + DO_TEST_CAPS_LATEST("graphics-spice-no-args"); 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.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" +- driver.config->spiceSASLdir = g_strdup("/root/.sasl2"); ++ driver.config->spiceSASLdir = g_strdup("/root/.sasl"); + DO_TEST_CAPS_LATEST("graphics-spice-sasl"); + VIR_FREE(driver.config->spiceSASLdir); + driver.config->spiceSASL = 0; +diff -ur libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf libvirt-8.4.0/tests/virconfdata/libvirtd.conf +--- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:08.555491270 +0200 ++++ libvirt-8.4.0/tests/virconfdata/libvirtd.conf 2022-06-02 23:58:32.240542468 +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 +203,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 +212,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-8.4.0.orig/tests/virconfdata/libvirtd.out libvirt-8.4.0/tests/virconfdata/libvirtd.out +--- libvirt-8.4.0.orig/tests/virconfdata/libvirtd.out 2022-06-02 23:58:08.555491270 +0200 ++++ libvirt-8.4.0/tests/virconfdata/libvirtd.out 2022-06-02 23:58:32.240542468 +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 +224,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