cryptospore / rpms / qemu-kvm

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