1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Wed, 9 Dec 2015 14:33:34 +0100
4 Subject: [PATCH] PVE: [Config] ui/spice: default to pve certificates
7 ui/spice-core.c | 15 +++++++++------
8 1 file changed, 9 insertions(+), 6 deletions(-)
10 diff --git a/ui/spice-core.c b/ui/spice-core.c
11 index f8c0878529..d327533c8f 100644
14 @@ -667,32 +667,35 @@ void qemu_spice_init(void)
17 x509_dir = qemu_opt_get(opts, "x509-dir");
22 str = qemu_opt_get(opts, "x509-key-file");
24 x509_key_file = g_strdup(str);
26 + } else if (x509_dir) {
27 x509_key_file = g_strdup_printf("%s/%s", x509_dir,
28 X509_SERVER_KEY_FILE);
30 + x509_key_file = g_strdup("/etc/pve/local/pve-ssl.key");
33 str = qemu_opt_get(opts, "x509-cert-file");
35 x509_cert_file = g_strdup(str);
37 + } else if (x509_dir) {
38 x509_cert_file = g_strdup_printf("%s/%s", x509_dir,
39 X509_SERVER_CERT_FILE);
41 + x509_cert_file = g_strdup("/etc/pve/local/pve-ssl.pem");
44 str = qemu_opt_get(opts, "x509-cacert-file");
46 x509_cacert_file = g_strdup(str);
48 + } else if (x509_dir) {
49 x509_cacert_file = g_strdup_printf("%s/%s", x509_dir,
52 + x509_cacert_file = g_strdup("/etc/pve/pve-root-ca.pem");
55 x509_key_password = qemu_opt_get(opts, "x509-key-password");