From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Wolfgang Bumiller <w.bumiller@proxmox.com>

Date: Wed, 9 Dec 2015 14:33:34 +0100

Subject: [PATCH] ui/spice: default to pve certs unless otherwise specified

---

 ui/spice-core.c | 15 +++++++++------

 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ui/spice-core.c b/ui/spice-core.c

index 4a417310d3..af1dc8c653 100644

--- a/ui/spice-core.c

+++ b/ui/spice-core.c

@@ -685,32 +685,35 @@ void qemu_spice_init(void)

     if (tls_port) {

         x509_dir = qemu_opt_get(opts, "x509-dir");

-        if (!x509_dir) {

-            x509_dir = ".";

-        }

         str = qemu_opt_get(opts, "x509-key-file");

         if (str) {

             x509_key_file = g_strdup(str);

-        } else {

+        } else if (x509_dir) {

             x509_key_file = g_strdup_printf("%s/%s", x509_dir,

                                             X509_SERVER_KEY_FILE);

+        } else {

+            x509_key_file = g_strdup("/etc/pve/local/pve-ssl.key");

         }

         str = qemu_opt_get(opts, "x509-cert-file");

         if (str) {

             x509_cert_file = g_strdup(str);

-        } else {

+        } else if (x509_dir) {

             x509_cert_file = g_strdup_printf("%s/%s", x509_dir,

                                              X509_SERVER_CERT_FILE);

+        } else {

+            x509_cert_file = g_strdup("/etc/pve/local/pve-ssl.pem");

         }

         str = qemu_opt_get(opts, "x509-cacert-file");

         if (str) {

             x509_cacert_file = g_strdup(str);

-        } else {

+        } else if (x509_dir) {

             x509_cacert_file = g_strdup_printf("%s/%s", x509_dir,

                                                X509_CA_CERT_FILE);

+        } else {

+            x509_cacert_file = g_strdup("/etc/pve/pve-root-ca.pem");

         }

         x509_key_password = qemu_opt_get(opts, "x509-key-password");

-- 

2.11.0