From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWl5y-0007OV-4E for qemu-devel@nongnu.org; Thu, 17 Oct 2013 06:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VWl5p-000610-GE for qemu-devel@nongnu.org; Thu, 17 Oct 2013 06:46:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63250) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VWl5p-00060s-8O for qemu-devel@nongnu.org; Thu, 17 Oct 2013 06:46:13 -0400 From: Gerd Hoffmann Date: Thu, 17 Oct 2013 12:45:57 +0200 Message-Id: <1382006760-19388-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1382006760-19388-1-git-send-email-kraxel@redhat.com> References: <1382006760-19388-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] Fix VNC SASL authentication when using a QXL device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Christophe Fergeau , Anthony Liguori From: Christophe Fergeau ui/vnc.c:vnc_display_open() and spice-server/server/reds.c:do_spice_init() are both calling sasl_server_init(). If spice_server_set_sasl_appname() hasn't been called, spice-server will call it with "spice" as an appname, causing cyrus-sasl to try to use a /etc/sasl2/spice.conf config file rather than the /etc/sasl2/qemu.conf file that QEMU uses. When using -spice sasl on the command line, QEMU properly calls spice_server_set_sasl_appname() to set the SASL appname as "qemu", but when using a QXL device without using SPICE, spice_server_init() is called from qemu_spice_add_interface() without setting the appname to "qemu", which then causes the VNC code to try to use spice.conf instead of qemu.conf. Signed-off-by: Christophe Fergeau Signed-off-by: Gerd Hoffmann --- ui/spice-core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/spice-core.c b/ui/spice-core.c index 79020a1..1976b71 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -832,6 +832,7 @@ int qemu_spice_add_interface(SpiceBaseInstance *sin) * With a command line like '-vnc :0 -vga qxl' you'll end up here. */ spice_server = spice_server_new(); + spice_server_set_sasl_appname(spice_server, "qemu"); spice_server_init(spice_server, &core_interface); qemu_add_vm_change_state_handler(vm_change_state_handler, NULL); } -- 1.8.3.1