Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140711-…

…1' into staging spice: auth fixes # gpg: Signature made Fri 11 Jul 2014 10:17:15 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <[email protected]>" # gpg: aka "Gerd Hoffmann <[email protected]>" # gpg: aka "Gerd Hoffmann (private) <[email protected]>" * remotes/spice/tags/pull-spice-20140711-1: spice: auth fixes Signed-off-by: Peter Maydell <[email protected]>
fatenever · Jul 11, 2014 · 42ca32f · 42ca32f
2 parents 22df345 + b1ea7b7
commit 42ca32f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ui/spice-core.c b/ui/spice-core.c
@@ -741,6 +741,7 @@ void qemu_spice_init(void)
             error_report("spice: failed to enable sasl");
             exit(1);
         }
+        auth = "sasl";
     }
     if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) {
         auth = "none";
@@ -894,6 +895,10 @@ static int qemu_spice_set_ticket(bool fail_if_conn, bool disconnect_if_conn)
 int qemu_spice_set_passwd(const char *passwd,
                           bool fail_if_conn, bool disconnect_if_conn)
 {
+    if (strcmp(auth, "spice") != 0) {
+        return -1;
+    }
+
     g_free(auth_passwd);
     auth_passwd = g_strdup(passwd);
     return qemu_spice_set_ticket(fail_if_conn, disconnect_if_conn);