]> git.proxmox.com Git - mirror_qemu.git/commit - ui/spice-core.c
Fix corner-case when using VNC+SASL+SPICE
authorChristophe Fergeau <cfergeau@redhat.com>
Tue, 12 Jan 2016 14:08:58 +0000 (15:08 +0100)
committerGerd Hoffmann <kraxel@redhat.com>
Mon, 18 Jan 2016 15:36:21 +0000 (16:36 +0100)
commit06bb88145cb977fe699a80df82b619eadbc29b28
tree5975fa40fc5674e9c20102e411513d3a57a04463
parent67c4c2bd958b0074ffbcde12cb434cd064adab12
Fix corner-case when using VNC+SASL+SPICE

Similarly to the commit 764eb39d1b6 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>
ui/spice-core.c