[Qemu-devel] [PATCH] Fix corner-case when using VNC+SASL+SPICE

* [Qemu-devel] [PATCH] Fix corner-case when using VNC+SASL+SPICE
@ 2016-01-12 14:08 Christophe Fergeau
  2016-01-12 14:27 ` Gerd Hoffmann
  2016-01-15 23:33 ` Eric Blake
  0 siblings, 2 replies; 5+ messages in thread
From: Christophe Fergeau @ 2016-01-12 14:08 UTC (permalink / raw)
  To: qemu-devel; +Cc: Gerd Hoffmann

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 unconditionnally 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>
---
 ui/spice-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 3322bf2..77b209f 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -743,8 +743,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);
         }
@@ -810,6 +809,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);
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 5+ messages in thread