[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/7] ui: fix regression in x509verify parameter for V
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/7] ui: fix regression in x509verify parameter for VNC server |
Date: |
Thu, 12 Mar 2015 10:00:22 +0100 |
From: "Daniel P. Berrange" <address@hidden>
The 'x509verify' parameter is documented as taking a path to the
x509 certificates, ie the same syntax as the 'x509' parameter.
commit 4db14629c38611061fc19ec6927405923de84f08
Author: Gerd Hoffmann <address@hidden>
Date: Tue Sep 16 12:33:03 2014 +0200
vnc: switch to QemuOpts, allow multiple servers
caused a regression by turning 'x509verify' into a boolean
parameter instead. This breaks setup from libvirt and is not
consistent with the docs.
Signed-off-by: Daniel P. Berrange <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/ui/vnc.c b/ui/vnc.c
index db8409b..b514777 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3303,7 +3303,7 @@ static QemuOptsList qemu_vnc_opts = {
.type = QEMU_OPT_BOOL,
},{
.name = "x509verify",
- .type = QEMU_OPT_BOOL,
+ .type = QEMU_OPT_STRING,
},{
.name = "acl",
.type = QEMU_OPT_BOOL,
@@ -3410,9 +3410,14 @@ void vnc_display_open(const char *id, Error **errp)
#ifdef CONFIG_VNC_TLS
tls = qemu_opt_get_bool(opts, "tls", false);
path = qemu_opt_get(opts, "x509");
+ if (!path) {
+ path = qemu_opt_get(opts, "x509verify");
+ if (path) {
+ vs->tls.x509verify = true;
+ }
+ }
if (path) {
x509 = true;
- vs->tls.x509verify = qemu_opt_get_bool(opts, "x509verify", false);
if (vnc_tls_set_x509_creds_dir(vs, path) < 0) {
error_setg(errp, "Failed to find x509 certificates/keys in %s",
path);
--
1.8.3.1
- [Qemu-devel] [PULL 0/7] vnc patch queue., Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 2/7] vnc: remove dead code, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 6/7] vnc: avoid possible file handler leak, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 7/7] vnc: fix segmentation fault when invalid vnc parameters are specified, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 5/7] ui/console: fix OVERFLOW_BEFORE_WIDEN, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 3/7] vnc: switch to inet_listen_opts, Gerd Hoffmann, 2015/03/12
- [Qemu-devel] [PULL 4/7] ui: fix regression in x509verify parameter for VNC server,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/7] vnc: drop display+ws_display from VncDisplay, Gerd Hoffmann, 2015/03/12
- Re: [Qemu-devel] [PULL 0/7] vnc patch queue., Peter Maydell, 2015/03/12