OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

spice: auth fixes

Browse Source 
Set auth to sasl when sasl is enabled, this makes "info spice" correctly
display sasl auth.  Also throw an error in case someone tries to set
a spice password via monitor without auth mode being "spice".

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2014-07-02 12:56:42 +02:00
parent 9e99c5fd70
commit b1ea7b79e1
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/spice-core.c
View File

@ -741,6 +741,7 @@ void qemu_spice_init(void)
error_report("spice: failed to enable sasl"); error_report("spice: failed to enable sasl");
exit(1); exit(1);
} }
auth = "sasl";
} }
if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) { if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) {
auth = "none"; 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, int qemu_spice_set_passwd(const char *passwd,
bool fail_if_conn, bool disconnect_if_conn) bool fail_if_conn, bool disconnect_if_conn)
{ {
if (strcmp(auth, "spice") != 0) {
return -1;
}
g_free(auth_passwd); g_free(auth_passwd);
auth_passwd = g_strdup(passwd); auth_passwd = g_strdup(passwd);
return qemu_spice_set_ticket(fail_if_conn, disconnect_if_conn); return qemu_spice_set_ticket(fail_if_conn, disconnect_if_conn);