]>
Commit | Line | Data |
---|---|---|
23102ed6 | 1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
95259824 WB |
2 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> |
3 | Date: Tue, 12 Jan 2016 09:09:49 +0100 | |
23102ed6 | 4 | Subject: [PATCH] vnc: make x509 imply tls again |
95259824 WB |
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 | |
6838f038 | 11 | index 03f8f61b2e..4494cb1dd4 100644 |
95259824 WB |
12 | --- a/ui/vnc.c |
13 | +++ b/ui/vnc.c | |
6838f038 | 14 | @@ -4034,9 +4034,8 @@ void vnc_display_open(const char *id, Error **errp) |
95259824 WB |
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 | -- | |
45169293 | 27 | 2.11.0 |
95259824 | 28 |