rebased pve patches

2017-08-07 09:10:07 +02:00
parent 3c6facff3f
commit 67af0fa481
53 changed files with 2877 additions and 4319 deletions
@@ -0,0 +1,28 @@
+From e90d84abb42bc2befe9a48a9be2873d5dce68236 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bumiller <w.bumiller@proxmox.com>
+Date: Tue, 12 Jan 2016 09:09:49 +0100
+Subject: [PATCH 16/28] vnc: make x509 imply tls again
+
+---
+ ui/vnc.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/ui/vnc.c b/ui/vnc.c
+index 9c8ab42eea..eb9420e830 100644
+--- a/ui/vnc.c
+++ b/ui/vnc.c
+@@ -3881,9 +3881,8 @@ void vnc_display_open(const char *id, Error **errp)
+         const char *path;
+         bool tls = false, x509 = false, x509verify = false;
+         tls  = qemu_opt_get_bool(opts, "tls", false);
+-        if (tls) {
+-            path = qemu_opt_get(opts, "x509");
+-
+        path = qemu_opt_get(opts, "x509");
+        if (tls || path) {
+             if (path) {
+                 x509 = true;
+             } else {
+-- 
+2.11.0
+