Commit 06bb8814 authored Jan 12, 2016 by Christophe Fergeau Committed by Gerd Hoffmann Jan 18, 2016

Fix corner-case when using VNC+SASL+SPICE

Similarly to the commit 764eb39d fixing VNC+SASL+QXL, when starting
QEMU with SPICE but no SASL, and at the same time VNC with SASL, then
spice_server_init() will get called without a previous call to
spice_server_set_sasl_appname(), which will cause cyrus-sasl to
try to use /etc/sasl2/spice.conf (spice-server uses "spice" as its
default appname) rather than the expected /etc/sasl2/qemu.conf.

This commit unconditionally calls spice_server_set_sasl_appname()
before calling spice_server_init() in order to use the correct appname
even if SPICE without SASL was requested on qemu command line.

Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Message-id: 1452607738-1521-1-git-send-email-cfergeau@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

parent 67c4c2bd

ui/spice-core.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -727,8 +727,7 @@ void qemu_spice_init(void)
		qemu_spice_set_passwd(password, false, false);
		}
		if (qemu_opt_get_bool(opts, "sasl", 0)) {
		if (spice_server_set_sasl_appname(spice_server, "qemu") == -1 \|\|
		spice_server_set_sasl(spice_server, 1) == -1) {
		if (spice_server_set_sasl(spice_server, 1) == -1) {
		error_report("spice: failed to enable sasl");
		exit(1);
		}
		@@ -794,6 +793,7 @@ void qemu_spice_init(void)

		seamless_migration = qemu_opt_get_bool(opts, "seamless-migration", 0);
		spice_server_set_seamless_migration(spice_server, seamless_migration);
		spice_server_set_sasl_appname(spice_server, "qemu");
		if (spice_server_init(spice_server, &core_interface) != 0) {
		error_report("failed to initialize spice server");
		exit(1);