X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=libvirt-sasl.patch;h=5f6b5bd9fe76513fcf22092c2718d2ff9ee18a20;hb=392f6a6608e85bb2105c0ad3d5856c033cc35f6a;hp=3e19ce660a8b1e8878e3e47a2aa7f471cdc9856e;hpb=1718358acaea43778ae6ad6656e62efe07a92f75;p=packages%2Flibvirt.git diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch index 3e19ce6..5f6b5bd 100644 --- a/libvirt-sasl.patch +++ b/libvirt-sasl.patch @@ -1,16 +1,16 @@ -diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.conf ---- libvirt-0.8.8/daemon/libvirtd.conf 2010-12-20 14:35:22.000000000 +0100 -+++ libvirt-0.8.8-sasl/daemon/libvirtd.conf 2011-04-28 11:45:47.727741165 +0200 -@@ -111,7 +111,7 @@ +diff -urp libvirt-3.0.0.orig/daemon/libvirtd.conf libvirt-3.0.0/daemon/libvirtd.conf +--- libvirt-3.0.0.orig/daemon/libvirtd.conf 2017-02-11 15:58:23.924363757 +0000 ++++ libvirt-3.0.0/daemon/libvirtd.conf 2017-02-11 15:58:43.786363533 +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. + # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -142,7 +142,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,9 +19,10 @@ diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.c #auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. ---- libvirt-1.1.3/daemon/Makefile.am.orig 2013-10-22 16:46:45.409294047 +0200 -+++ libvirt-1.1.3/daemon/Makefile.am 2013-10-22 20:09:12.185450964 +0200 -@@ -453,13 +453,13 @@ +diff -urp libvirt-3.0.0.orig/daemon/Makefile.am libvirt-3.0.0/daemon/Makefile.am +--- libvirt-3.0.0.orig/daemon/Makefile.am 2017-02-11 15:58:23.923363757 +0000 ++++ libvirt-3.0.0/daemon/Makefile.am 2017-02-11 15:58:43.786363533 +0000 +@@ -532,13 +532,13 @@ POD2MAN = pod2man -c "Virtualization Sup # the WITH_LIBVIRTD conditional if WITH_SASL install-data-sasl: @@ -39,58 +40,79 @@ diff -ru libvirt-0.8.8/daemon/libvirtd.conf libvirt-0.8.8-sasl/daemon/libvirtd.c else ! WITH_SASL install-data-sasl: uninstall-data-sasl: -diff -ru libvirt-0.8.8/daemon/test_libvirtd.aug libvirt-0.8.8-sasl/daemon/test_libvirtd.aug -diff -ru libvirt-0.8.8/docs/auth.html libvirt-0.8.8-sasl/docs/auth.html ---- libvirt-0.8.8/docs/auth.html 2011-02-17 05:13:12.000000000 +0100 -+++ libvirt-0.8.8-sasl/docs/auth.html 2011-04-28 11:45:43.429741167 +0200 -@@ -273,7 +273,7 @@ +diff -urp libvirt-3.0.0.orig/daemon/Makefile.in libvirt-3.0.0/daemon/Makefile.in +--- libvirt-3.0.0.orig/daemon/Makefile.in 2017-02-11 15:58:23.923363757 +0000 ++++ libvirt-3.0.0/daemon/Makefile.in 2017-02-11 15:58:43.786363533 +0000 +@@ -2932,13 +2932,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-3.0.0.orig/docs/auth.html libvirt-3.0.0/docs/auth.html +--- libvirt-3.0.0.orig/docs/auth.html 2017-02-11 15:58:23.865363758 +0000 ++++ libvirt-3.0.0/docs/auth.html 2017-02-11 15:58:43.787363533 +0000 +@@ -257,7 +257,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 /etc/sasl2/libvirt.conf. +the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf. The mech_list parameter must first be changed to gssapi - instead of the default digest-md5. If SASL is enabled on the UNIX - and/or TLS sockets, Kerberos will also be used for them. Like DIGEST-MD5, the Kerberos -diff -ru libvirt-0.8.8/docs/auth.html.in libvirt-0.8.8-sasl/docs/auth.html.in ---- libvirt-0.8.8/docs/auth.html.in 2010-12-20 14:35:22.000000000 +0100 -+++ libvirt-0.8.8-sasl/docs/auth.html.in 2011-04-28 11:45:43.586741167 +0200 -@@ -115,7 +115,7 @@ + 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-3.0.0.orig/docs/auth.html.in libvirt-3.0.0/docs/auth.html.in +--- libvirt-3.0.0.orig/docs/auth.html.in 2017-02-11 15:58:23.867363758 +0000 ++++ libvirt-3.0.0/docs/auth.html.in 2017-02-11 15:58:43.787363533 +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 /etc/sasl2/libvirt.conf. +the libvirt SASL configuration file must be changed. This is /etc/sasl/libvirt.conf. The mech_list parameter must first be changed to gssapi - instead of the default digest-md5. If SASL is enabled on the UNIX - and/or TLS sockets, Kerberos will also be used for them. Like DIGEST-MD5, the Kerberos -diff -ru libvirt-0.8.8/libvirt.spec libvirt-0.8.8-sasl/libvirt.spec ---- libvirt-0.8.8/libvirt.spec 2011-02-17 05:13:09.000000000 +0100 -+++ libvirt-0.8.8-sasl/libvirt.spec 2011-04-28 11:45:43.675741167 +0200 -@@ -933,7 +933,7 @@ - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ - - %if %{with_sasl} + 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-3.0.0.orig/libvirt.spec libvirt-3.0.0/libvirt.spec +--- libvirt-3.0.0.orig/libvirt.spec 2017-02-11 15:58:23.878363757 +0000 ++++ libvirt-3.0.0/libvirt.spec 2017-02-11 15:58:43.787363533 +0000 +@@ -1844,7 +1844,7 @@ exit 0 + + %{_datadir}/libvirt/test-screenshot.png + -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - %files devel -diff -ru libvirt-0.8.8/libvirt.spec.in libvirt-0.8.8-sasl/libvirt.spec.in ---- libvirt-0.8.8/libvirt.spec.in 2011-02-17 05:10:58.000000000 +0100 -+++ libvirt-0.8.8-sasl/libvirt.spec.in 2011-04-28 11:45:43.672741167 +0200 -@@ -933,7 +933,7 @@ - %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/ + %files admin + %{_mandir}/man1/virt-admin.1* +diff -urp libvirt-3.0.0.orig/libvirt.spec.in libvirt-3.0.0/libvirt.spec.in +--- libvirt-3.0.0.orig/libvirt.spec.in 2017-02-11 15:58:23.877363757 +0000 ++++ libvirt-3.0.0/libvirt.spec.in 2017-02-11 15:58:43.787363533 +0000 +@@ -1844,7 +1844,7 @@ exit 0 + + %{_datadir}/libvirt/test-screenshot.png - %if %{with_sasl} -%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%config(noreplace) %{_sysconfdir}/sasl/libvirt.conf - %endif - %files devel ---- libvirt-0.9.13/src/qemu/qemu.conf.orig 2012-05-31 16:23:22.000000000 +0200 -+++ libvirt-0.9.13/src/qemu/qemu.conf 2012-07-08 11:37:16.366378718 +0200 -@@ -74,18 +74,18 @@ + %files admin + %{_mandir}/man1/virt-admin.1* +diff -urp libvirt-3.0.0.orig/src/qemu/qemu.conf libvirt-3.0.0/src/qemu/qemu.conf +--- libvirt-3.0.0.orig/src/qemu/qemu.conf 2017-02-11 15:58:23.898363757 +0000 ++++ libvirt-3.0.0/src/qemu/qemu.conf 2017-02-11 15:58:43.788363533 +0000 +@@ -112,18 +112,18 @@ # Examples include vinagre, virt-viewer and virt-manager # itself. UltraVNC, RealVNC, TightVNC do not support this # @@ -112,11 +134,133 @@ diff -ru libvirt-0.8.8/libvirt.spec.in libvirt-0.8.8-sasl/libvirt.spec.in # QEMU implements an extension for providing audio over a VNC connection, -diff -ru libvirt-0.8.8/src/qemu/test_libvirtd_qemu.aug libvirt-0.8.8-sasl/src/qemu/test_libvirtd_qemu.aug -diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/confdata/libvirtd.conf ---- libvirt-0.8.8/tests/confdata/libvirtd.conf 2010-05-27 14:03:22.000000000 +0200 -+++ libvirt-0.8.8-sasl/tests/confdata/libvirtd.conf 2011-04-28 11:45:46.878741165 +0200 -@@ -102,7 +102,7 @@ +@@ -187,17 +187,17 @@ + # Enable use of SASL encryption on the SPICE server. This requires + # a SPICE client which supports the SASL protocol extension. + # +-# It is necessary to configure /etc/sasl2/qemu.conf to choose ++# It is necessary to configure /etc/sasl/qemu.conf to choose + # the desired SASL plugin (eg, GSSPI for Kerberos) + # + #spice_sasl = 1 + +-# The default SASL configuration file is located in /etc/sasl2/ ++# The default SASL configuration file is located in /etc/sasl/ + # When running libvirtd unprivileged, it may be desirable to + # override the configs in this location. Set this parameter to + # point to the directory, and create a qemu.conf in that location + # +-#spice_sasl_dir = "/some/directory/sasl2" ++#spice_sasl_dir = "/some/directory/sasl" + + # Enable use of TLS encryption on the chardev TCP transports. + # +diff -urp libvirt-3.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in libvirt-3.0.0/src/qemu/test_libvirtd_qemu.aug.in +--- libvirt-3.0.0.orig/src/qemu/test_libvirtd_qemu.aug.in 2017-02-11 15:58:23.898363757 +0000 ++++ libvirt-3.0.0/src/qemu/test_libvirtd_qemu.aug.in 2017-02-11 15:58:43.788363533 +0000 +@@ -12,7 +12,7 @@ module Test_libvirtd_qemu = + { "vnc_tls_x509_verify" = "1" } + { "vnc_password" = "XYZ12345" } + { "vnc_sasl" = "1" } +-{ "vnc_sasl_dir" = "/some/directory/sasl2" } ++{ "vnc_sasl_dir" = "/some/directory/sasl" } + { "vnc_allow_host_audio" = "0" } + { "spice_listen" = "0.0.0.0" } + { "spice_tls" = "1" } +@@ -20,7 +20,7 @@ module Test_libvirtd_qemu = + { "spice_auto_unix_socket" = "1" } + { "spice_password" = "XYZ12345" } + { "spice_sasl" = "1" } +-{ "spice_sasl_dir" = "/some/directory/sasl2" } ++{ "spice_sasl_dir" = "/some/directory/sasl" } + { "chardev_tls" = "1" } + { "chardev_tls_x509_cert_dir" = "/etc/pki/libvirt-chardev" } + { "chardev_tls_x509_verify" = "1" } +diff -urp libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args +--- libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2017-02-11 15:58:23.938363757 +0000 ++++ libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-sasl.args 2017-02-11 15:58:43.788363533 +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 \ + -name QEMUGuest1 \ +diff -urp libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args +--- libvirt-3.0.0.orig/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2017-02-11 15:58:23.938363757 +0000 ++++ libvirt-3.0.0/tests/qemuargv2xmldata/qemuargv2xml-graphics-vnc-tls.args 2017-02-11 15:58:43.788363533 +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 \ + -name QEMUGuest1 \ +diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args +--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-02-11 15:58:23.949363757 +0000 ++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args 2017-02-11 15:58:43.788363533 +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 \ + -name QEMUGuest1 \ +diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2017-02-11 15:58:23.950363757 +0000 ++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2017-02-11 15:58:43.788363533 +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 \ + -name QEMUGuest1 \ +diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +--- libvirt-3.0.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2017-02-11 15:58:23.950363757 +0000 ++++ libvirt-3.0.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2017-02-11 15:58:43.788363533 +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 \ + -name QEMUGuest1 \ +diff -urp libvirt-3.0.0.orig/tests/qemuxml2argvtest.c libvirt-3.0.0/tests/qemuxml2argvtest.c +--- libvirt-3.0.0.orig/tests/qemuxml2argvtest.c 2017-02-11 15:58:23.934363757 +0000 ++++ libvirt-3.0.0/tests/qemuxml2argvtest.c 2017-02-11 15:59:22.996363092 +0000 +@@ -1033,7 +1033,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; +@@ -1057,7 +1057,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-3.0.0.orig/tests/virconfdata/libvirtd.conf libvirt-3.0.0/tests/virconfdata/libvirtd.conf +--- libvirt-3.0.0.orig/tests/virconfdata/libvirtd.conf 2017-02-11 15:58:24.047363756 +0000 ++++ libvirt-3.0.0/tests/virconfdata/libvirtd.conf 2017-02-11 15:58:43.789363533 +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 @@ -125,7 +269,7 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/con # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -133,7 +133,7 @@ +@@ -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 @@ -134,10 +278,10 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/con auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. -diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/confdata/libvirtd.out ---- libvirt-0.8.8/tests/confdata/libvirtd.out 2010-05-27 14:03:22.000000000 +0200 -+++ libvirt-0.8.8-sasl/tests/confdata/libvirtd.out 2011-04-28 11:45:46.875741165 +0200 -@@ -82,7 +82,7 @@ +diff -urp libvirt-3.0.0.orig/tests/virconfdata/libvirtd.out libvirt-3.0.0/tests/virconfdata/libvirtd.out +--- libvirt-3.0.0.orig/tests/virconfdata/libvirtd.out 2017-02-11 15:58:24.047363756 +0000 ++++ libvirt-3.0.0/tests/virconfdata/libvirtd.out 2017-02-11 15:58:43.789363533 +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 @@ -146,7 +290,7 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf # socket only GSSAPI & DIGEST-MD5 mechanisms will be used. # For non-TCP or TLS sockets, any scheme is allowed. # -@@ -111,7 +111,7 @@ +@@ -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 @@ -155,32 +299,3 @@ diff -ru libvirt-0.8.8/tests/confdata/libvirtd.out libvirt-0.8.8-sasl/tests/conf auth_tcp = "sasl" # Change the authentication scheme for TLS sockets. # ---- libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args.orig 2014-07-03 20:04:05.132591762 +0200 -+++ libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args 2014-07-03 20:42:03.205829499 +0200 -@@ -1,5 +1,5 @@ - LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ -+SASL_CONF_PATH=/root/.sasl QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -m 214 \ - -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ ---- libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args.orig 2014-07-03 20:04:05.132591762 +0200 -+++ libvirt-1.2.6/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args 2014-07-03 20:42:29.659161721 +0200 -@@ -1,5 +1,5 @@ - LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ --SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ -+SASL_CONF_PATH=/root/.sasl QEMU_AUDIO_DRV=none \ - /usr/bin/qemu -S -M pc -m 214 \ - -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ - /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ ---- libvirt-1.0.6/tests/qemuxml2argvtest.c.orig 2013-06-16 15:44:25.855183409 +0200 -+++ libvirt-1.0.6/tests/qemuxml2argvtest.c 2013-06-16 15:45:12.908515760 +0200 -@@ -614,7 +614,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_VGA); - driver.config->vncTLS = 1; - driver.config->vncTLSx509verify = 1;