debian/patches/pve/0029-vnc-make-x509-imply-tls-again.patch

   1 From 4e0a43ec969bcdf5d3bb01892bc75346e47676d6 Mon Sep 17 00:00:00 2001
   2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
   3 Date: Tue, 12 Jan 2016 09:09:49 +0100
   4 Subject: [PATCH 29/47] vnc: make x509 imply tls again
   5
   6 ---
   7  ui/vnc.c | 5 ++---
   8  1 file changed, 2 insertions(+), 3 deletions(-)
   9
  10 diff --git a/ui/vnc.c b/ui/vnc.c
  11 index 29575f8..039b3ed 100644
  12 --- a/ui/vnc.c
  13 +++ b/ui/vnc.c
  14 @@ -3878,9 +3878,8 @@ void vnc_display_open(const char *id, Error **errp)
  15          const char *path;
  16          bool tls = false, x509 = false, x509verify = false;
  17          tls  = qemu_opt_get_bool(opts, "tls", false);
  18 -        if (tls) {
  19 -            path = qemu_opt_get(opts, "x509");
  20 -
  21 +        path = qemu_opt_get(opts, "x509");
  22 +        if (tls || path) {
  23              if (path) {
  24                  x509 = true;
  25              } else {
  26 --
  27 2.1.4
  28