diff options
| author | Daniel P. Berrange <berrange@redhat.com> | 2016-09-29 16:45:34 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-10-13 09:21:02 +0200 |
| commit | 38e5756a614e9a492d1bb181166cd031bc87e159 (patch) | |
| tree | 1c464ce9cadfda52317d63701b98f476e54cb645 /ui/vnc.c | |
| parent | 12b2806761a2dd4b88bdbe6f3bee4bcd998a9918 (diff) | |
| download | focaccia-qemu-38e5756a614e9a492d1bb181166cd031bc87e159.tar.gz focaccia-qemu-38e5756a614e9a492d1bb181166cd031bc87e159.zip | |
ui: remove 'ws_tls' field from VncState
The 'ws_tls' field in VncState is only ever representing the result of 'tlscreds != NULL' and is thus pointless. Replace use of 'ws_tls' with a direct check against 'tlscreds' Signed-off-by: Daniel P. Berrange <berrange@redhat.com> Message-id: 1475163940-26094-4-git-send-email-berrange@redhat.com Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'ui/vnc.c')
| -rw-r--r-- | ui/vnc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ui/vnc.c b/ui/vnc.c index 45a23d30f4..83a608b3cb 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3029,7 +3029,7 @@ static void vnc_connect(VncDisplay *vd, QIOChannelSocket *sioc, qio_channel_set_blocking(vs->ioc, false, NULL); if (websocket) { vs->websocket = 1; - if (vd->ws_tls) { + if (vd->tlscreds) { vs->ioc_tag = qio_channel_add_watch( vs->ioc, G_IO_IN, vncws_tls_handshake_io, vs, NULL); } else { @@ -3379,9 +3379,6 @@ vnc_display_setup_auth(VncDisplay *vs, if (password) { if (vs->tlscreds) { vs->auth = VNC_AUTH_VENCRYPT; - if (websocket) { - vs->ws_tls = true; - } if (object_dynamic_cast(OBJECT(vs->tlscreds), TYPE_QCRYPTO_TLS_CREDS_X509)) { VNC_DEBUG("Initializing VNC server with x509 password auth\n"); @@ -3409,9 +3406,6 @@ vnc_display_setup_auth(VncDisplay *vs, } else if (sasl) { if (vs->tlscreds) { vs->auth = VNC_AUTH_VENCRYPT; - if (websocket) { - vs->ws_tls = true; - } if (object_dynamic_cast(OBJECT(vs->tlscreds), TYPE_QCRYPTO_TLS_CREDS_X509)) { VNC_DEBUG("Initializing VNC server with x509 SASL auth\n"); @@ -3439,9 +3433,6 @@ vnc_display_setup_auth(VncDisplay *vs, } else { if (vs->tlscreds) { vs->auth = VNC_AUTH_VENCRYPT; - if (websocket) { - vs->ws_tls = true; - } if (object_dynamic_cast(OBJECT(vs->tlscreds), TYPE_QCRYPTO_TLS_CREDS_X509)) { VNC_DEBUG("Initializing VNC server with x509 no auth\n"); |