debian/patches/spice-use-pve-certs.patch

   1 Index: new/ui/spice-core.c
   2 ===================================================================
   3 --- new.orig/ui/spice-core.c    2013-07-23 09:49:39.000000000 +0200
   4 +++ new/ui/spice-core.c 2013-07-23 09:56:56.000000000 +0200
   5 @@ -669,33 +669,38 @@
   6
   7      if (tls_port) {
   8          x509_dir = qemu_opt_get(opts, "x509-dir");
   9 -        if (NULL == x509_dir) {
  10 -            x509_dir = ".";
  11 +        if (x509_dir) {
  12 +            len = strlen(x509_dir) + 32;
  13          }
  14 -        len = strlen(x509_dir) + 32;
  15
  16          str = qemu_opt_get(opts, "x509-key-file");
  17          if (str) {
  18              x509_key_file = g_strdup(str);
  19 -        } else {
  20 +        } else if (x509_dir) {
  21              x509_key_file = g_malloc(len);
  22              snprintf(x509_key_file, len, "%s/%s", x509_dir, X509_SERVER_KEY_FILE);
  23 +        } else {
  24 +            x509_key_file = g_strdup("/etc/pve/local/pve-ssl.key");
  25          }
  26
  27          str = qemu_opt_get(opts, "x509-cert-file");
  28          if (str) {
  29              x509_cert_file = g_strdup(str);
  30 -        } else {
  31 +        } else if (x509_dir) {
  32              x509_cert_file = g_malloc(len);
  33              snprintf(x509_cert_file, len, "%s/%s", x509_dir, X509_SERVER_CERT_FILE);
  34 +        } else {
  35 +            x509_cert_file = g_strdup("/etc/pve/local/pve-ssl.pem");
  36          }
  37
  38          str = qemu_opt_get(opts, "x509-cacert-file");
  39          if (str) {
  40              x509_cacert_file = g_strdup(str);
  41 -        } else {
  42 +        } else if (x509_dir) {
  43              x509_cacert_file = g_malloc(len);
  44              snprintf(x509_cacert_file, len, "%s/%s", x509_dir, X509_CA_CERT_FILE);
  45 +        } else {
  46 +            x509_cacert_file = g_strdup("/etc/pve/pve-root-ca.pem");
  47          }
  48
  49          x509_key_password = qemu_opt_get(opts, "x509-key-password");