* [Qemu-devel] [PATCH v2] spice: Allow to set password even if disable-ticketing was used
@ 2015-08-14 15:10 Christophe Fergeau
2015-10-09 16:43 ` Christophe Fergeau
0 siblings, 1 reply; 3+ messages in thread
From: Christophe Fergeau @ 2015-08-14 15:10 UTC (permalink / raw)
To: qemu-devel
Before commit b1ea7b79e1, it was possible to start with -spice
disable-ticketing, and then use the "set_password spice" command to
enable ticketing with SPICE. Since commit b1ea7b79e1 this is no longer
possible as qemu_spice_set_ticket() will return an error unless the
'auth' type is "spice". When ticketing is disabled, 'auth' is "none" so
the attempt to set password fails.
This commit allows to call qemu_spice_set_ticket() when 'auth' is "none"
and changes 'auth' to "spice" when this happens.
Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---
Changes since v1:
- added Reviewed-by and missing Signed-off-by tags
ui/spice-core.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ui/spice-core.c b/ui/spice-core.c
index 4da3042..3b20c6c 100644
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -882,6 +882,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, "none") == 0) {
+ /* Allow to set a password when started with 'disable-ticketing' */
+ auth = "spice";
+ }
if (strcmp(auth, "spice") != 0) {
return -1;
}
--
2.4.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] spice: Allow to set password even if disable-ticketing was used
2015-08-14 15:10 [Qemu-devel] [PATCH v2] spice: Allow to set password even if disable-ticketing was used Christophe Fergeau
@ 2015-10-09 16:43 ` Christophe Fergeau
2015-10-12 7:57 ` Gerd Hoffmann
0 siblings, 1 reply; 3+ messages in thread
From: Christophe Fergeau @ 2015-10-09 16:43 UTC (permalink / raw)
To: qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1563 bytes --]
Hey,
On Fri, Aug 14, 2015 at 05:10:57PM +0200, Christophe Fergeau wrote:
> Before commit b1ea7b79e1, it was possible to start with -spice
> disable-ticketing, and then use the "set_password spice" command to
> enable ticketing with SPICE. Since commit b1ea7b79e1 this is no longer
> possible as qemu_spice_set_ticket() will return an error unless the
> 'auth' type is "spice". When ticketing is disabled, 'auth' is "none" so
> the attempt to set password fails.
>
> This commit allows to call qemu_spice_set_ticket() when 'auth' is "none"
> and changes 'auth' to "spice" when this happens.
>
> Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Any taker for that patch?
Thanks,
Christophe
> ---
> Changes since v1:
> - added Reviewed-by and missing Signed-off-by tags
>
>
> ui/spice-core.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/ui/spice-core.c b/ui/spice-core.c
> index 4da3042..3b20c6c 100644
> --- a/ui/spice-core.c
> +++ b/ui/spice-core.c
> @@ -882,6 +882,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, "none") == 0) {
> + /* Allow to set a password when started with 'disable-ticketing' */
> + auth = "spice";
> + }
> if (strcmp(auth, "spice") != 0) {
> return -1;
> }
> --
> 2.4.3
>
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] spice: Allow to set password even if disable-ticketing was used
2015-10-09 16:43 ` Christophe Fergeau
@ 2015-10-12 7:57 ` Gerd Hoffmann
0 siblings, 0 replies; 3+ messages in thread
From: Gerd Hoffmann @ 2015-10-12 7:57 UTC (permalink / raw)
To: Christophe Fergeau; +Cc: qemu-devel
Hi,
> > Signed-off-by: Christophe Fergeau <cfergeau@redhat.com>
> > Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
>
> Any taker for that patch?
please resend, with me in cc, and add to the changelog why this is
needed.
thanks,
Gerd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-12 7:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-14 15:10 [Qemu-devel] [PATCH v2] spice: Allow to set password even if disable-ticketing was used Christophe Fergeau
2015-10-09 16:43 ` Christophe Fergeau
2015-10-12 7:57 ` Gerd Hoffmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.