]> TLD Linux GIT Repositories - packages/libvirt.git/blobdiff - libvirt-sasl.patch
- updated to 5.10.0
[packages/libvirt.git] / libvirt-sasl.patch
index 58b86d89fddcffb51f98f87a6c4504e8a996bacc..913e1dd7e915b8cefdc4e00190666544adf8e976 100644 (file)
@@ -1,19 +1,7 @@
-diff -urp libvirt-5.3.0.orig/docs/auth.html libvirt-5.3.0/docs/auth.html
---- libvirt-5.3.0.orig/docs/auth.html  2019-04-27 12:38:48.466109972 +0200
-+++ libvirt-5.3.0/docs/auth.html       2019-05-06 14:07:53.494000000 +0200
-@@ -318,7 +318,7 @@ to turn on SASL auth in these listeners.
-         <p>
- 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 <code>/etc/sasl2/libvirt.conf</code> to set the <code>mech_list</code>
-+editting <code>/etc/sasl/libvirt.conf</code> to set the <code>mech_list</code>
- parameter to <code>scram-sha-1</code>.
-     </p>
-         <p>
-diff -urp libvirt-5.3.0.orig/docs/auth.html.in libvirt-5.3.0/docs/auth.html.in
---- libvirt-5.3.0.orig/docs/auth.html.in       2019-02-26 00:24:58.954183786 +0100
-+++ libvirt-5.3.0/docs/auth.html.in    2019-05-06 14:07:53.494000000 +0200
-@@ -277,7 +277,7 @@ to turn on SASL auth in these listeners.
+diff -ur libvirt-5.10.0.orig/docs/auth.html.in libvirt-5.10.0/docs/auth.html.in
+--- libvirt-5.10.0.orig/docs/auth.html.in      2019-12-08 00:42:43.765000000 +0100
++++ libvirt-5.10.0/docs/auth.html.in   2019-12-08 00:43:02.262000000 +0100
+@@ -275,7 +275,7 @@
      <p>
  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,21 +10,21 @@ diff -urp libvirt-5.3.0.orig/docs/auth.html.in libvirt-5.3.0/docs/auth.html.in
  parameter to <code>scram-sha-1</code>.
      </p>
      <p>
-diff -urp libvirt-5.3.0.orig/src/Makefile.in libvirt-5.3.0/src/Makefile.in
---- libvirt-5.3.0.orig/src/Makefile.in 2019-05-04 19:53:42.037199636 +0200
-+++ libvirt-5.3.0/src/Makefile.in      2019-05-06 14:07:53.497000000 +0200
-@@ -6271,7 +6271,7 @@ REMOTE_DRIVER_PROTOCOL = \
+diff -ur libvirt-5.10.0.orig/src/Makefile.in libvirt-5.10.0/src/Makefile.in
+--- libvirt-5.10.0.orig/src/Makefile.in        2019-12-08 00:42:43.668000000 +0100
++++ libvirt-5.10.0/src/Makefile.in     2019-12-08 00:43:02.265000000 +0100
+@@ -7409,7 +7409,7 @@
  
  # This is needed for clients too, so can't wrap in
  # the WITH_LIBVIRTD conditional
 -@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 -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
---- libvirt-5.3.0.orig/src/qemu/qemu.conf      2019-05-04 19:50:45.015543968 +0200
-+++ libvirt-5.3.0/src/qemu/qemu.conf   2019-05-06 14:07:53.498000000 +0200
+ LIBVIRTD_UNIT_VARS = \
+       $(COMMON_UNIT_VARS) \
+       -e 's|[@]name[@]|Libvirt|g' \
+diff -ur libvirt-5.10.0.orig/src/qemu/qemu.conf libvirt-5.10.0/src/qemu/qemu.conf
+--- libvirt-5.10.0.orig/src/qemu/qemu.conf     2019-12-08 00:42:43.698000000 +0100
++++ libvirt-5.10.0/src/qemu/qemu.conf  2019-12-08 00:43:02.265000000 +0100
 @@ -135,18 +135,18 @@
  # Examples include vinagre, virt-viewer and virt-manager
  # itself. UltraVNC, RealVNC, TightVNC do not support this
@@ -80,10 +68,10 @@ diff -urp libvirt-5.3.0.orig/src/qemu/qemu.conf libvirt-5.3.0/src/qemu/qemu.conf
  
  # Enable use of TLS encryption on the chardev TCP transports.
  #
-diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in
---- libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in      2019-02-26 00:24:59.030183057 +0100
-+++ libvirt-5.3.0/src/qemu/test_libvirtd_qemu.aug.in   2019-05-06 14:07:53.498000000 +0200
-@@ -13,7 +13,7 @@ module Test_libvirtd_qemu =
+diff -ur libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in
+--- libvirt-5.10.0.orig/src/qemu/test_libvirtd_qemu.aug.in     2019-12-08 00:42:43.697000000 +0100
++++ libvirt-5.10.0/src/qemu/test_libvirtd_qemu.aug.in  2019-12-08 00:43:02.265000000 +0100
+@@ -13,7 +13,7 @@
  { "vnc_tls_x509_verify" = "1" }
  { "vnc_password" = "XYZ12345" }
  { "vnc_sasl" = "1" }
@@ -92,7 +80,7 @@ diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/sr
  { "vnc_allow_host_audio" = "0" }
  { "spice_listen" = "0.0.0.0" }
  { "spice_tls" = "1" }
-@@ -21,7 +21,7 @@ module Test_libvirtd_qemu =
+@@ -21,7 +21,7 @@
  { "spice_auto_unix_socket" = "1" }
  { "spice_password" = "XYZ12345" }
  { "spice_sasl" = "1" }
@@ -101,79 +89,79 @@ diff -urp libvirt-5.3.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-5.3.0/sr
  { "chardev_tls" = "1" }
  { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" }
  { "chardev_tls_x509_verify" = "1" }
-diff -urp libvirt-5.3.0.orig/src/remote/libvirtd.conf libvirt-5.3.0/src/remote/libvirtd.conf
---- libvirt-5.3.0.orig/src/remote/libvirtd.conf        2019-04-27 12:31:34.943092025 +0200
-+++ libvirt-5.3.0/src/remote/libvirtd.conf     2019-05-06 14:07:53.498000000 +0200
-@@ -123,7 +123,7 @@
+diff -ur libvirt-5.10.0.orig/src/remote/Makefile.inc.am libvirt-5.10.0/src/remote/Makefile.inc.am
+--- libvirt-5.10.0.orig/src/remote/Makefile.inc.am     2019-12-08 00:42:43.683000000 +0100
++++ libvirt-5.10.0/src/remote/Makefile.inc.am  2019-12-08 00:43:02.266000000 +0100
+@@ -375,7 +375,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.10.0.orig/src/remote/libvirtd.conf.in libvirt-5.10.0/src/remote/libvirtd.conf.in
+--- libvirt-5.10.0.orig/src/remote/libvirtd.conf.in    2019-12-08 00:42:43.683000000 +0100
++++ libvirt-5.10.0/src/remote/libvirtd.conf.in 2019-12-08 00:43:02.266000000 +0100
+@@ -134,7 +134,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 @@
+@@ -166,7 +166,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-5.3.0.orig/src/remote/Makefile.inc.am libvirt-5.3.0/src/remote/Makefile.inc.am
---- libvirt-5.3.0.orig/src/remote/Makefile.inc.am      2019-04-27 12:31:34.942092034 +0200
-+++ libvirt-5.3.0/src/remote/Makefile.inc.am   2019-05-06 14:07:53.498000000 +0200
-@@ -244,7 +244,7 @@ endif WITH_LIBVIRTD
- # 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 -urp libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args
---- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-sasl.args   2018-01-12 15:48:37.072414510 +0100
-+++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-sasl.args        2019-05-06 14:07:53.499000000 +0200
-@@ -3,7 +3,7 @@ PATH=/bin \
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args        2019-12-08 00:42:43.289000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-spice-sasl.args     2019-12-08 00:43:02.266000000 +0100
+@@ -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-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args
---- libvirt-5.3.0.orig/tests/qemuargv2xmldata/graphics-vnc-tls.args    2018-01-12 15:48:37.073414500 +0100
-+++ libvirt-5.3.0/tests/qemuargv2xmldata/graphics-vnc-tls.args 2019-05-06 14:07:53.499000000 +0200
-@@ -3,7 +3,7 @@ PATH=/bin \
HOME=/home/test \
USER=test \
LOGNAME=test \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args  2019-12-08 00:42:43.303000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args       2019-12-08 00:43:02.266000000 +0100
+@@ -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-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args
---- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-spice-sasl.args 2019-04-27 12:31:35.106090528 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-spice-sasl.args      2019-05-06 14:08:46.241000000 +0200
-@@ -6,7 +6,7 @@ LOGNAME=test \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args      2019-12-08 00:42:43.303000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args   2019-12-08 00:43:02.266000000 +0100
+@@ -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-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args
---- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args   2019-04-27 12:31:35.108090510 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args        2019-05-06 14:08:24.446000000 +0200
-@@ -6,7 +6,7 @@ LOGNAME=test \
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args   2019-12-08 00:42:43.289000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.args        2019-12-08 00:43:02.266000000 +0100
+@@ -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 \
@@ -182,10 +170,10 @@ diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-sasl.args libvi
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
  -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args
---- libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args    2019-04-27 12:31:35.109090500 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2019-05-06 14:08:33.926000000 +0200
-@@ -6,7 +6,7 @@ LOGNAME=test \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args      2019-12-08 00:42:43.297000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args   2019-12-08 00:43:02.267000000 +0100
+@@ -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 \
@@ -193,32 +181,44 @@ diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args libvir
 +SASL_CONF_PATH=/root/.sasl \
  QEMU_AUDIO_DRV=none \
  /usr/bin/qemu-system-i686 \
- -name QEMUGuest1 \
-diff -urp libvirt-5.3.0.orig/tests/qemuxml2argvtest.c libvirt-5.3.0/tests/qemuxml2argvtest.c
---- libvirt-5.3.0.orig/tests/qemuxml2argvtest.c        2019-04-27 12:31:35.156090069 +0200
-+++ libvirt-5.3.0/tests/qemuxml2argvtest.c     2019-05-06 14:07:53.502000000 +0200
-@@ -1145,7 +1145,7 @@ mymain(void)
+ -name guest=QEMUGuest1,debug-threads=on \
+diff -ur libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+--- libvirt-5.10.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args     2019-12-08 00:42:43.299000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args  2019-12-08 00:43:02.298000000 +0100
+@@ -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.10.0.orig/tests/qemuxml2argvtest.c libvirt-5.10.0/tests/qemuxml2argvtest.c
+--- libvirt-5.10.0.orig/tests/qemuxml2argvtest.c       2019-12-08 00:42:43.258000000 +0100
++++ libvirt-5.10.0/tests/qemuxml2argvtest.c    2019-12-08 00:43:42.225000000 +0100
+@@ -1188,7 +1188,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"));
+-    driver.config->vncSASLdir = g_strdup("/root/.sasl2");
++    driver.config->vncSASLdir = g_strdup("/root/.sasl");
      DO_TEST("graphics-vnc-sasl", QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
      driver.config->vncTLS = 1;
      driver.config->vncTLSx509verify = 1;
-@@ -1177,7 +1177,7 @@ mymain(void)
+@@ -1218,7 +1218,7 @@
      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"));
+-    driver.config->spiceSASLdir = g_strdup("/root/.sasl2");
++    driver.config->spiceSASLdir = g_strdup("/root/.sasl");
      DO_TEST("graphics-spice-sasl",
              QEMU_CAPS_SPICE,
              QEMU_CAPS_DEVICE_QXL);
-diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.0/tests/virconfdata/libvirtd.conf
---- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf 2017-10-30 08:32:36.772365929 +0100
-+++ libvirt-5.3.0/tests/virconfdata/libvirtd.conf      2019-05-06 14:07:53.502000000 +0200
-@@ -108,7 +108,7 @@ unix_sock_admin_perms = "0700"
+diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.10.0/tests/virconfdata/libvirtd.conf
+--- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.conf        2019-12-08 00:42:43.506000000 +0100
++++ libvirt-5.10.0/tests/virconfdata/libvirtd.conf     2019-12-08 00:43:02.300000000 +0100
+@@ -91,7 +91,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -227,7 +227,7 @@ diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.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
@@ -236,10 +236,10 @@ diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.conf libvirt-5.3.0/tests
  auth_tcp = "sasl"
  
  # Change the authentication scheme for TLS sockets.
-diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out libvirt-5.3.0/tests/virconfdata/libvirtd.out
---- libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out  2017-10-30 08:32:36.772365929 +0100
-+++ libvirt-5.3.0/tests/virconfdata/libvirtd.out       2019-05-06 14:07:53.502000000 +0200
-@@ -87,7 +87,7 @@ unix_sock_admin_perms = "0700"
+diff -ur libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out libvirt-5.10.0/tests/virconfdata/libvirtd.out
+--- libvirt-5.10.0.orig/tests/virconfdata/libvirtd.out 2019-12-08 00:42:43.506000000 +0100
++++ libvirt-5.10.0/tests/virconfdata/libvirtd.out      2019-12-08 00:43:02.300000000 +0100
+@@ -73,7 +73,7 @@
  #          the network providing auth (eg, TLS/x509 certificates)
  #
  #  - sasl: use SASL infrastructure. The actual auth scheme is then
@@ -248,7 +248,7 @@ diff -urp libvirt-5.3.0.orig/tests/virconfdata/libvirtd.out libvirt-5.3.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