-From d42052d75321a1af75b039f8e31127b98485ec93 Mon Sep 17 00:00:00 2001
+From 96d45d67af5ef5033273a39e953ac86f7e693dbb 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 29/47] vnc: make x509 imply tls again
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
-index b9f36b5..acbe3bd 100644
+index 29575f8..039b3ed 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
-@@ -3729,9 +3729,8 @@ void vnc_display_open(const char *id, Error **errp)
+@@ -3878,9 +3878,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);