External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-18 10:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

xenconfig: fix spicepasswd handling

Browse Source 
The logic related to spicedisable_ticketing and spicepasswd was
inverted.  As per man xl.cfg(5), 'spicedisable_ticketing = 1'
means no passwd is required.  On the other hand, a passwd is
required if 'spicedisable_ticketing = 0'.  Fix the logic and
produce and error if 'spicedisable_ticketing = 0' but spicepasswd
is not provided.  Also fix the spice cfg test file.

Signed-off-by: Jim Fehlig <jfehlig@suse.com>
This commit is contained in:
Jim Fehlig 2015-04-23 16:00:45 -06:00
parent e21b1180a9
commit a460295f4e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenconfig/xen_xl.c
View File

@ -192,8 +192,8 @@ xenParseXLSpice(virConfPtr conf, virDomainDefPtr def)
if (xenConfigGetBool(conf, "spicedisable_ticketing", &val, 0) < 0) if (xenConfigGetBool(conf, "spicedisable_ticketing", &val, 0) < 0)
goto cleanup; goto cleanup;
if (val) { if (!val) {
if (xenConfigCopyStringOpt(conf, "spicepasswd", if (xenConfigCopyString(conf, "spicepasswd",
&graphics->data.spice.auth.passwd) < 0) &graphics->data.spice.auth.passwd) < 0)
goto cleanup; goto cleanup;
} }
@ -697,13 +697,15 @@ xenFormatXLSpice(virConfPtr conf, virDomainDefPtr def)
return -1; return -1;
if (graphics->data.spice.auth.passwd) { if (graphics->data.spice.auth.passwd) {
if (xenConfigSetInt(conf, "spicedisable_ticketing", 1) < 0) if (xenConfigSetInt(conf, "spicedisable_ticketing", 0) < 0)
return -1; return -1;
if (graphics->data.spice.auth.passwd && if (xenConfigSetString(conf, "spicepasswd",
xenConfigSetString(conf, "spicepasswd",
graphics->data.spice.auth.passwd) < 0) graphics->data.spice.auth.passwd) < 0)
return -1; return -1;
} else {
if (xenConfigSetInt(conf, "spicedisable_ticketing", 1) < 0)
return -1;
} }
if (xenConfigSetInt(conf, "spiceagent_mouse", if (xenConfigSetInt(conf, "spiceagent_mouse",

2
tests/xlconfigdata/test-spice.cfg
View File

@ -25,6 +25,6 @@ spice = 1
spicehost = "127.0.0.1" spicehost = "127.0.0.1"
spiceport = 590 spiceport = 590
spicetls_port = 500 spicetls_port = 500
spicedisable_ticketing = 1 spicedisable_ticketing = 0
spicepasswd = "thebeast" spicepasswd = "thebeast"
spiceagent_mouse = 0 spiceagent_mouse = 0