cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
958e1b
From 3d38cb5a412b18287684cd52579afe8034294d53 Mon Sep 17 00:00:00 2001
958e1b
From: Gerd Hoffmann <kraxel@redhat.com>
958e1b
Date: Tue, 18 Nov 2014 13:35:20 +0100
958e1b
Subject: [PATCH 34/41] spice: call qemu_spice_set_passwd() during init
958e1b
MIME-Version: 1.0
958e1b
Content-Type: text/plain; charset=UTF-8
958e1b
Content-Transfer-Encoding: 8bit
958e1b
958e1b
Message-id: <1416317720-17906-2-git-send-email-kraxel@redhat.com>
958e1b
Patchwork-id: 62433
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH 1/1] spice: call qemu_spice_set_passwd() during init
958e1b
Bugzilla: 1138639
958e1b
RH-Acked-by: Amos Kong <akong@redhat.com>
958e1b
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
958e1b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
958e1b
958e1b
From: Marc-André Lureau <marcandre.lureau@gmail.com>
958e1b
958e1b
Don't call SPICE API directly to set password given in command line, but
958e1b
use the internal API, saving password for later calls.
958e1b
958e1b
This solves losing password when changing expiration in qemu monitor.
958e1b
958e1b
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
958e1b
(cherry picked from commit 07d49a53b6394941ed833486a3acb5c480d87db2)
958e1b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
958e1b
---
958e1b
 ui/spice-core.c | 2 +-
958e1b
 1 file changed, 1 insertion(+), 1 deletion(-)
958e1b
958e1b
diff --git a/ui/spice-core.c b/ui/spice-core.c
958e1b
index 99a76d2..141afd1 100644
958e1b
--- a/ui/spice-core.c
958e1b
+++ b/ui/spice-core.c
958e1b
@@ -721,7 +721,7 @@ void qemu_spice_init(void)
958e1b
                              tls_ciphers);
958e1b
     }
958e1b
     if (password) {
958e1b
-        spice_server_set_ticket(spice_server, password, 0, 0, 0);
958e1b
+        qemu_spice_set_passwd(password, false, false);
958e1b
     }
958e1b
     if (qemu_opt_get_bool(opts, "sasl", 0)) {
958e1b
         if (spice_server_set_sasl_appname(spice_server, "qemu") == -1 ||
958e1b
-- 
958e1b
1.8.3.1
958e1b