pve-qemu/debian/patches/pve/0029-vnc-make-x509-imply-tl...

29 lines
827 B
Diff
Raw Normal View History

2017-04-05 12:38:26 +03:00
From 4e0a43ec969bcdf5d3bb01892bc75346e47676d6 Mon Sep 17 00:00:00 2001
2017-04-05 11:49:19 +03:00
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Tue, 12 Jan 2016 09:09:49 +0100
2017-04-05 12:38:26 +03:00
Subject: [PATCH 29/48] vnc: make x509 imply tls again
2017-04-05 11:49:19 +03:00
---
ui/vnc.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
2017-04-05 12:38:26 +03:00
index 29575f8..039b3ed 100644
2017-04-05 11:49:19 +03:00
--- a/ui/vnc.c
+++ b/ui/vnc.c
2017-04-05 12:38:26 +03:00
@@ -3878,9 +3878,8 @@ void vnc_display_open(const char *id, Error **errp)
2017-04-05 11:49:19 +03:00
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.1.4