| Message ID | 1452607738-1521-1-git-send-email-cfergeau@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Di, 2016-01-12 at 15:08 +0100, Christophe Fergeau wrote: > 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. Added to patch queue. thanks, Gerd
On 01/12/2016 07:08 AM, Christophe Fergeau wrote: > 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() s/unconditionnally/unconditionally/ > 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> > ---
On Fr, 2016-01-15 at 16:33 -0700, Eric Blake wrote: > > This commit unconditionnally calls spice_server_set_sasl_appname() > > s/unconditionnally/unconditionally/ Fixed up, no need to resend. cheers, Gerd
On Mon, Jan 18, 2016 at 11:11:42AM +0100, Gerd Hoffmann wrote: > On Fr, 2016-01-15 at 16:33 -0700, Eric Blake wrote: > > > This commit unconditionnally calls spice_server_set_sasl_appname() > > > > s/unconditionnally/unconditionally/ > > Fixed up, no need to resend. Thanks! Christophe
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);
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(-)