-diff -urp libvirt-2.3.0.orig/daemon/libvirtd.conf libvirt-2.3.0/daemon/libvirtd.conf
---- libvirt-2.3.0.orig/daemon/libvirtd.conf 2016-10-28 19:13:22.641715000 +0000
-+++ libvirt-2.3.0/daemon/libvirtd.conf 2016-10-28 19:13:48.452715000 +0000
-@@ -123,7 +123,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
- # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
- # For non-TCP or TLS sockets, any scheme is allowed.
- #
-@@ -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
--# 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.3.0.orig/daemon/Makefile.am libvirt-2.3.0/daemon/Makefile.am
---- libvirt-2.3.0.orig/daemon/Makefile.am 2016-10-28 19:13:22.638715000 +0000
-+++ libvirt-2.3.0/daemon/Makefile.am 2016-10-28 19:13:48.468715000 +0000
-@@ -528,13 +528,13 @@ POD2MAN = pod2man -c "Virtualization Sup
- # the WITH_LIBVIRTD conditional
- if WITH_SASL
- install-data-sasl:
-- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
-- $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- uninstall-data-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-data-sasl:
- uninstall-data-sasl:
-diff -urp libvirt-2.3.0.orig/daemon/Makefile.in libvirt-2.3.0/daemon/Makefile.in
---- libvirt-2.3.0.orig/daemon/Makefile.in 2016-10-28 19:13:22.638715000 +0000
-+++ libvirt-2.3.0/daemon/Makefile.in 2016-10-28 19:13:48.469715000 +0000
-@@ -2847,13 +2847,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:
--@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl2/
-+@WITH_SASL_TRUE@ $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sasl/
- @WITH_SASL_TRUE@ $(INSTALL_DATA) $(srcdir)/libvirtd.sasl \
--@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl2/libvirt.conf
-+@WITH_SASL_TRUE@ $(DESTDIR)$(sysconfdir)/sasl/libvirt.conf
-
- @WITH_SASL_TRUE@uninstall-data-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-data-sasl:
- @WITH_SASL_FALSE@uninstall-data-sasl:
-
-diff -urp libvirt-2.3.0.orig/docs/auth.html libvirt-2.3.0/docs/auth.html
---- libvirt-2.3.0.orig/docs/auth.html 2016-10-28 19:13:22.665715000 +0000
-+++ libvirt-2.3.0/docs/auth.html 2016-10-28 19:13:48.470715000 +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,
--the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
-+the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
- The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
- instead of the default <code>digest-md5</code>, and keytab should be set to
- <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-diff -urp libvirt-2.3.0.orig/docs/auth.html.in libvirt-2.3.0/docs/auth.html.in
---- libvirt-2.3.0.orig/docs/auth.html.in 2016-10-28 19:13:22.677715000 +0000
-+++ libvirt-2.3.0/docs/auth.html.in 2016-10-28 19:13:48.474715000 +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,
--the libvirt SASL configuration file must be changed. This is <code>/etc/sasl2/libvirt.conf</code>.
-+the libvirt SASL configuration file must be changed. This is <code>/etc/sasl/libvirt.conf</code>.
- The <code>mech_list</code> parameter must first be changed to <code>gssapi</code>
- instead of the default <code>digest-md5</code>, and keytab should be set to
- <code>/etc/libvirt/krb5.tab</code> . If SASL is enabled on the UNIX
-Only in libvirt-2.3.0: libvirt-sasl.patch
-diff -urp libvirt-2.3.0.orig/libvirt.spec libvirt-2.3.0/libvirt.spec
---- libvirt-2.3.0.orig/libvirt.spec 2016-10-28 19:13:22.458715000 +0000
-+++ libvirt-2.3.0/libvirt.spec 2016-10-28 19:13:48.474715000 +0000
-@@ -1832,7 +1832,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.3.0.orig/libvirt.spec.in libvirt-2.3.0/libvirt.spec.in
---- libvirt-2.3.0.orig/libvirt.spec.in 2016-10-28 19:13:22.455715000 +0000
-+++ libvirt-2.3.0/libvirt.spec.in 2016-10-28 19:13:48.475715000 +0000
-@@ -1832,7 +1832,7 @@ exit 0
- %{_datadir}/libvirt/cpu_map.xml
- %{_datadir}/libvirt/libvirtLogo.png
-
--%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
-+%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf
-
- %files admin
- %{_mandir}/man1/virt-admin.1*
-diff -urp libvirt-2.3.0.orig/src/qemu/qemu.conf libvirt-2.3.0/src/qemu/qemu.conf
---- libvirt-2.3.0.orig/src/qemu/qemu.conf 2016-10-28 19:13:22.586715000 +0000
-+++ libvirt-2.3.0/src/qemu/qemu.conf 2016-10-28 19:13:48.475715000 +0000
-@@ -98,18 +98,18 @@