X-Git-Url: https://git.tld-linux.org/?p=packages%2Flibvirt.git;a=blobdiff_plain;f=libvirt-sasl.patch;h=474acdb2b33aa601bf069f19d05183ca7228deae;hp=7823a6085f5e1ea67065e608dbf5aeac867599bf;hb=5362742718a035681452094c18259125ad56676e;hpb=270ab3676a03a7dea28909130a6edfc9a8c68651 diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 7823a60..474acdb 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,7 +1,7 @@ -diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd.conf ---- libvirt-1.3.3.orig/daemon/libvirtd.conf 2016-04-14 10:15:59.438170000 +0000 -+++ libvirt-1.3.3/daemon/libvirtd.conf 2016-04-14 10:16:21.849170000 +0000 -@@ -128,7 +128,7 @@ +diff -urp libvirt-2.1.0.orig/daemon/libvirtd.conf libvirt-2.1.0/daemon/libvirtd.conf +--- libvirt-2.1.0.orig/daemon/libvirtd.conf 2016-08-20 10:07:32.043554000 +0000 ++++ libvirt-2.1.0/daemon/libvirtd.conf 2016-08-20 10:07:47.074554000 +0000 +@@ -123,7 +123,7 @@ # the network providing auth (eg, TLS/x509 certificates) # # - sasl: use SASL infrastructure. The actual auth scheme is then @@ -10,7 +10,7 @@ diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd. # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -159,7 +159,7 @@ +@@ -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 @@ -19,10 +19,10 @@ diff -urp libvirt-1.3.3.orig/daemon/libvirtd.conf libvirt-1.3.3/daemon/libvirtd. #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -urp libvirt-1.3.3.orig/daemon/Makefile.am libvirt-1.3.3/daemon/Makefile.am ---- libvirt-1.3.3.orig/daemon/Makefile.am 2016-04-14 10:15:59.438170000 +0000 -+++ libvirt-1.3.3/daemon/Makefile.am 2016-04-14 10:16:21.849170000 +0000 -@@ -521,13 +521,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in +diff -urp libvirt-2.1.0.orig/daemon/Makefile.am libvirt-2.1.0/daemon/Makefile.am +--- libvirt-2.1.0.orig/daemon/Makefile.am 2016-08-20 10:07:32.040554000 +0000 ++++ libvirt-2.1.0/daemon/Makefile.am 2016-08-20 10:07:47.074554000 +0000 +@@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup # the WITH_LIBVIRTD conditional if WITH_SASL install-data-sasl: @@ -40,10 +40,10 @@ diff -urp libvirt-1.3.3.orig/daemon/Makefile.am libvirt-1.3.3/daemon/Makefile.am else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -diff -urp libvirt-1.3.3.orig/daemon/Makefile.in libvirt-1.3.3/daemon/Makefile.in ---- libvirt-1.3.3.orig/daemon/Makefile.in 2016-04-14 10:15:59.436170000 +0000 -+++ libvirt-1.3.3/daemon/Makefile.in 2016-04-14 10:16:21.852170000 +0000 -@@ -2832,13 +2832,13 @@ $(srcdir)/libvirtd.8.in: libvirtd.pod.in +diff -urp libvirt-2.1.0.orig/daemon/Makefile.in libvirt-2.1.0/daemon/Makefile.in +--- libvirt-2.1.0.orig/daemon/Makefile.in 2016-08-20 10:07:32.040554000 +0000 ++++ libvirt-2.1.0/daemon/Makefile.in 2016-08-20 10:07:47.076554000 +0000 +@@ -2842,13 +2842,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: @@ -61,10 +61,10 @@ diff -urp libvirt-1.3.3.orig/daemon/Makefile.in libvirt-1.3.3/daemon/Makefile.in @WITH_SASL_FALSE@install-data-sasl: @WITH_SASL_FALSE@uninstall-data-sasl: -diff -urp libvirt-1.3.3.orig/docs/auth.html libvirt-1.3.3/docs/auth.html ---- libvirt-1.3.3.orig/docs/auth.html 2016-04-14 10:15:59.421170000 +0000 -+++ libvirt-1.3.3/docs/auth.html 2016-04-14 10:16:21.852170000 +0000 -@@ -404,7 +404,7 @@ again: +diff -urp libvirt-2.1.0.orig/docs/auth.html libvirt-2.1.0/docs/auth.html +--- libvirt-2.1.0.orig/docs/auth.html 2016-08-20 10:07:32.082554000 +0000 ++++ libvirt-2.1.0/docs/auth.html 2016-08-20 10:07:47.076554000 +0000 +@@ -415,7 +415,7 @@ again: The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, @@ -73,10 +73,10 @@ diff -urp libvirt-1.3.3.orig/docs/auth.html libvirt-1.3.3/docs/auth.html The mech_list parameter must first be changed to gssapi instead of the default digest-md5, and keytab should be set to /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX -diff -urp libvirt-1.3.3.orig/docs/auth.html.in libvirt-1.3.3/docs/auth.html.in ---- libvirt-1.3.3.orig/docs/auth.html.in 2016-04-14 10:15:59.414170000 +0000 -+++ libvirt-1.3.3/docs/auth.html.in 2016-04-14 10:16:21.853170000 +0000 -@@ -234,7 +234,7 @@ again: +diff -urp libvirt-2.1.0.orig/docs/auth.html.in libvirt-2.1.0/docs/auth.html.in +--- libvirt-2.1.0.orig/docs/auth.html.in 2016-08-20 10:07:32.100554000 +0000 ++++ libvirt-2.1.0/docs/auth.html.in 2016-08-20 10:07:47.077554000 +0000 +@@ -246,7 +246,7 @@ again: The plain TCP socket of the libvirt daemon defaults to using SASL for authentication. The SASL mechanism configured by default is DIGEST-MD5, which provides a basic username+password style authentication. To enable Kerberos single-sign-on instead, @@ -85,33 +85,33 @@ diff -urp libvirt-1.3.3.orig/docs/auth.html.in libvirt-1.3.3/docs/auth.html.in The mech_list parameter must first be changed to gssapi instead of the default digest-md5, and keytab should be set to /etc/libvirt/krb5.tab . If SASL is enabled on the UNIX -diff -urp libvirt-1.3.3.orig/libvirt.spec libvirt-1.3.3/libvirt.spec ---- libvirt-1.3.3.orig/libvirt.spec 2016-04-14 10:15:59.436170000 +0000 -+++ libvirt-1.3.3/libvirt.spec 2016-04-14 10:16:21.860170000 +0000 -@@ -2332,7 +2332,7 @@ exit 0 - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ +diff -urp libvirt-2.1.0.orig/libvirt.spec libvirt-2.1.0/libvirt.spec +--- libvirt-2.1.0.orig/libvirt.spec 2016-08-20 10:07:31.917554000 +0000 ++++ libvirt-2.1.0/libvirt.spec 2016-08-20 10:08:58.351554000 +0000 +@@ -1827,7 +1827,7 @@ exit 0 + %{_datadir}/libvirt/cpu_map.xml + %{_datadir}/libvirt/libvirtLogo.png - %if %{with_sasl} -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - %if %{with_wireshark} -diff -urp libvirt-1.3.3.orig/libvirt.spec.in libvirt-1.3.3/libvirt.spec.in ---- libvirt-1.3.3.orig/libvirt.spec.in 2016-04-14 10:16:00.591170000 +0000 -+++ libvirt-1.3.3/libvirt.spec.in 2016-04-14 10:16:21.872170000 +0000 -@@ -2332,7 +2332,7 @@ exit 0 - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ + %files admin + %{_mandir}/man1/virt-admin.1* +diff -urp libvirt-2.1.0.orig/libvirt.spec.in libvirt-2.1.0/libvirt.spec.in +--- libvirt-2.1.0.orig/libvirt.spec.in 2016-08-20 10:07:31.915554000 +0000 ++++ libvirt-2.1.0/libvirt.spec.in 2016-08-20 10:09:09.031554000 +0000 +@@ -1827,7 +1827,7 @@ exit 0 + %{_datadir}/libvirt/cpu_map.xml + %{_datadir}/libvirt/libvirtLogo.png - %if %{with_sasl} -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - %if %{with_wireshark} -diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf ---- libvirt-1.3.3.orig/src/qemu/qemu.conf 2016-04-14 10:16:00.616170000 +0000 -+++ libvirt-1.3.3/src/qemu/qemu.conf 2016-04-14 10:16:21.872170000 +0000 + %files admin + %{_mandir}/man1/virt-admin.1* +diff -urp libvirt-2.1.0.orig/src/qemu/qemu.conf libvirt-2.1.0/src/qemu/qemu.conf +--- libvirt-2.1.0.orig/src/qemu/qemu.conf 2016-08-20 10:07:31.997554000 +0000 ++++ libvirt-2.1.0/src/qemu/qemu.conf 2016-08-20 10:07:47.087554000 +0000 @@ -74,18 +74,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this @@ -134,7 +134,7 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf # QEMU implements an extension for providing audio over a VNC connection, -@@ -143,17 +143,17 @@ +@@ -154,17 +154,17 @@ # Enable use of SASL encryption on the SPICE server. This requires # a SPICE client which supports the SASL protocol extension. # @@ -155,10 +155,10 @@ diff -urp libvirt-1.3.3.orig/src/qemu/qemu.conf libvirt-1.3.3/src/qemu/qemu.conf # By default, if no graphical front end is configured, libvirt will disable -diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in ---- libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-04-14 10:16:00.617170000 +0000 -+++ libvirt-1.3.3/src/qemu/test_libvirtd_qemu.aug.in 2016-04-14 10:16:21.872170000 +0000 -@@ -9,14 +9,14 @@ module Test_libvirtd_qemu = +diff -urp libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-2.1.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:07:31.997554000 +0000 ++++ libvirt-2.1.0/src/qemu/test_libvirtd_qemu.aug.in 2016-08-20 10:09:46.009554000 +0000 +@@ -9,7 +9,7 @@ module Test_libvirtd_qemu = { "vnc_tls_x509_verify" = "1" } { "vnc_password" = "XYZ12345" } { "vnc_sasl" = "1" } @@ -167,7 +167,8 @@ diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/sr { "vnc_allow_host_audio" = "0" } { "spice_listen" = "0.0.0.0" } { "spice_tls" = "1" } - { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } +@@ -17,7 +17,7 @@ module Test_libvirtd_qemu = + { "spice_auto_unix_socket" = "1" } { "spice_password" = "XYZ12345" } { "spice_sasl" = "1" } -{ "spice_sasl_dir" = "/some/directory/sasl2" } @@ -175,51 +176,9 @@ diff -urp libvirt-1.3.3.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-1.3.3/sr { "nographics_allow_host_audio" = "1" } { "remote_display_port_min" = "5900" } { "remote_display_port_max" = "65535" } -diff -urp libvirt-1.3.3.orig/tests/confdata/libvirtd.conf libvirt-1.3.3/tests/confdata/libvirtd.conf ---- libvirt-1.3.3.orig/tests/confdata/libvirtd.conf 2016-04-14 10:16:00.575170000 +0000 -+++ libvirt-1.3.3/tests/confdata/libvirtd.conf 2016-04-14 10:16:21.872170000 +0000 -@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" - # 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. - # -@@ -139,7 +139,7 @@ auth_unix_rw = "none" - # 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-1.3.3.orig/tests/confdata/libvirtd.out libvirt-1.3.3/tests/confdata/libvirtd.out ---- libvirt-1.3.3.orig/tests/confdata/libvirtd.out 2016-04-14 10:16:00.575170000 +0000 -+++ libvirt-1.3.3/tests/confdata/libvirtd.out 2016-04-14 10:16:21.872170000 +0000 -@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" - # 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. - # -@@ -116,7 +116,7 @@ auth_unix_rw = "none" - # 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-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args ---- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-04-14 10:15:59.729170000 +0000 -+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-04-14 10:16:21.873170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args +--- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:32.590554000 +0000 ++++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2016-08-20 10:07:48.739554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -229,9 +188,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sa QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args ---- libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-04-14 10:15:59.730170000 +0000 -+++ libvirt-1.3.3/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-04-14 10:16:21.873170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args +--- libvirt-2.1.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:32.591554000 +0000 ++++ libvirt-2.1.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2016-08-20 10:07:48.739554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -241,9 +200,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tl QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args ---- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-04-14 10:15:59.691170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-04-14 10:16:21.873170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:32.622554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2016-08-20 10:07:48.740554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -253,9 +212,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice- QEMU_AUDIO_DRV=spice \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args ---- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-04-14 10:15:59.692170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-04-14 10:16:21.874170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:32.623554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2016-08-20 10:07:48.740554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -265,9 +224,9 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sa QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args ---- libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-04-14 10:15:59.672170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-04-14 10:16:21.874170000 +0000 +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +--- libvirt-2.1.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:32.623554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2016-08-20 10:07:48.740554000 +0000 @@ -3,7 +3,7 @@ PATH=/bin \ HOME=/home/test \ USER=test \ @@ -277,10 +236,10 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tl QEMU_AUDIO_DRV=none \ /usr/bin/qemu \ -name QEMUGuest1 \ -diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxml2argvtest.c ---- libvirt-1.3.3.orig/tests/qemuxml2argvtest.c 2016-04-14 10:15:59.666170000 +0000 -+++ libvirt-1.3.3/tests/qemuxml2argvtest.c 2016-04-14 10:16:21.875170000 +0000 -@@ -897,7 +897,7 @@ mymain(void) +diff -urp libvirt-2.1.0.orig/tests/qemuxml2argvtest.c libvirt-2.1.0/tests/qemuxml2argvtest.c +--- libvirt-2.1.0.orig/tests/qemuxml2argvtest.c 2016-08-20 10:07:32.132554000 +0000 ++++ libvirt-2.1.0/tests/qemuxml2argvtest.c 2016-08-20 10:07:48.741554000 +0000 +@@ -929,7 +929,7 @@ mymain(void) driver.config->vncSASL = 1; VIR_FREE(driver.config->vncSASLdir); @@ -289,7 +248,7 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxm DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC); driver.config->vncTLS = 1; driver.config->vncTLSx509verify = 1; -@@ -919,7 +919,7 @@ mymain(void) +@@ -953,7 +953,7 @@ mymain(void) DO_TEST("graphics-spice-no-args", QEMU_CAPS_SPICE); driver.config->spiceSASL = 1; @@ -298,3 +257,45 @@ diff -urp libvirt-1.3.3.orig/tests/qemuxml2argvtest.c libvirt-1.3.3/tests/qemuxm DO_TEST("graphics-spice-sasl", QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, +diff -urp libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.1.0/tests/virconfdata/libvirtd.conf +--- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.conf 2016-08-20 10:07:33.070554000 +0000 ++++ libvirt-2.1.0/tests/virconfdata/libvirtd.conf 2016-08-20 10:09:58.088554000 +0000 +@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700" + # 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. + # +@@ -139,7 +139,7 @@ auth_unix_rw = "none" + # 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-2.1.0.orig/tests/virconfdata/libvirtd.out libvirt-2.1.0/tests/virconfdata/libvirtd.out +--- libvirt-2.1.0.orig/tests/virconfdata/libvirtd.out 2016-08-20 10:07:33.070554000 +0000 ++++ libvirt-2.1.0/tests/virconfdata/libvirtd.out 2016-08-20 10:10:07.948554000 +0000 +@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700" + # 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. + # +@@ -116,7 +116,7 @@ auth_unix_rw = "none" + # 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. + #