OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

ui: fix regression in x509verify parameter for VNC server

Browse Source 
The 'x509verify' parameter is documented as taking a path to the
x509 certificates, ie the same syntax as the 'x509' parameter.

  commit 4db14629c3
  Author: Gerd Hoffmann <kraxel@redhat.com>
  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 <berrange@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Daniel P. Berrange 2015-03-10 16:27:34 +00:00 committed by Gerd Hoffmann
parent e556032960
commit 8c7d064573
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/vnc.c
View File

@ -3303,7 +3303,7 @@ static QemuOptsList qemu_vnc_opts = {
.type = QEMU_OPT_BOOL, .type = QEMU_OPT_BOOL,
},{ },{
.name = "x509verify", .name = "x509verify",
.type = QEMU_OPT_BOOL, .type = QEMU_OPT_STRING,
},{ },{
.name = "acl", .name = "acl",
.type = QEMU_OPT_BOOL, .type = QEMU_OPT_BOOL,
@ -3410,9 +3410,14 @@ void vnc_display_open(const char *id, Error **errp)
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
tls = qemu_opt_get_bool(opts, "tls", false); tls = qemu_opt_get_bool(opts, "tls", false);
path = qemu_opt_get(opts, "x509"); path = qemu_opt_get(opts, "x509");
if (!path) {
path = qemu_opt_get(opts, "x509verify");
if (path) {
vs->tls.x509verify = true;
}
}
if (path) { if (path) {
x509 = true; x509 = true;
vs->tls.x509verify = qemu_opt_get_bool(opts, "x509verify", false);
if (vnc_tls_set_x509_creds_dir(vs, path) < 0) { if (vnc_tls_set_x509_creds_dir(vs, path) < 0) {
error_setg(errp, "Failed to find x509 certificates/keys in %s", error_setg(errp, "Failed to find x509 certificates/keys in %s",
path); path);