From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5XFp-00014r-HO for qemu-devel@nongnu.org; Fri, 11 Jul 2014 05:36:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5XFh-000076-Su for qemu-devel@nongnu.org; Fri, 11 Jul 2014 05:36:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8420) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5XFh-00006t-L8 for qemu-devel@nongnu.org; Fri, 11 Jul 2014 05:36:25 -0400 From: Gerd Hoffmann Date: Fri, 11 Jul 2014 11:36:20 +0200 Message-Id: <1405071380-13652-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1405071380-13652-1-git-send-email-kraxel@redhat.com> References: <1405071380-13652-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 1/1] spice: auth fixes List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Anthony Liguori 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 --- ui/spice-core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ui/spice-core.c b/ui/spice-core.c index 70df446..7bb91e6 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -741,6 +741,7 @@ void qemu_spice_init(void) error_report("spice: failed to enable sasl"); exit(1); } + auth = "sasl"; } if (qemu_opt_get_bool(opts, "disable-ticketing", 0)) { 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, bool fail_if_conn, bool disconnect_if_conn) { + if (strcmp(auth, "spice") != 0) { + return -1; + } + g_free(auth_passwd); auth_passwd = g_strdup(passwd); return qemu_spice_set_ticket(fail_if_conn, disconnect_if_conn); -- 1.8.3.1